git-svn-id: https://svn.code.sf.net/p/borknet-dev-com/code/borknet_services/trunk...

diff --git a/CHANGES b/CHANGES
index b599908153631f7d9123ddb436fee75c53eaa8fd..e39cf6f2aec06c3b7b10b71cd6e49b3541eece52 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+20/04/2011 REV 95
+Core: Fixed not deleting empty channels
+
 18/03/2011 REV 94
 S: Added remove command.
 X: Fixed userchan references.

diff --git a/compile.bat b/compile.bat
index 458982dafdaeeedf72a3408e90458d00b2a60245..554304f14aba7ecef1f3b078de08a4b272e69338 100644 (file)
--- a/compile.bat
+++ b/compile.bat
@@ -3,8 +3,8 @@ rem
 rem Used for compiling on windows.\r
 rem \r
 \r
-rem set CLASSPATH=D:\java;D:\java\borknet_services\mail.jar;\r
- set CLASSPATH=D:\work;D:\work\borknet_services\mail.jar;\r
+ set CLASSPATH=D:\java;D:\java\borknet_services\mail.jar;\r
+rem set CLASSPATH=D:\work;D:\work\borknet_services\mail.jar;\r
 \r
 rem javac *.java\r
  javac core/*.java\r

diff --git a/core/CoreDBControl.class b/core/CoreDBControl.class
index 97f4239d3f62a1a2e5293bca4c0250c8e1f91b1e..c89c46c53fdb6468c821a0b6d124860c9b1e80ec 100644 (file)
Binary files a/core/CoreDBControl.class and b/core/CoreDBControl.class differ

diff --git a/core/CoreDBControl.java b/core/CoreDBControl.java
index 7dc3288f6e54abad42243e3e9ebd41fc8ad60fa3..6f4d7698ce98237fdd86cde815d9cae00aca9dc9 100644 (file)
--- a/core/CoreDBControl.java
+++ b/core/CoreDBControl.java
@@ -1415,11 +1415,7 @@ public class CoreDBControl
    ArrayList<String> userchannels = u.getChannels();\r
    for(String channel: userchannels)\r
    {\r
-    Channel c = channels.get(channel.toLowerCase());\r
-    if(c instanceof Channel)\r
-    {\r
-     c.delUser(numer);\r
-    }\r
+    delUserChan(channel, numer);\r
    }\r
                }\r
                catch ( Exception e )\r
@@ -1509,6 +1505,10 @@ public class CoreDBControl
   {\r
    c.delUser(user);\r
   }\r
+  if(c.getUsercount()<=0)\r
+  {\r
+   channels.remove(chan.toLowerCase());\r
+  }\r
   User u = usersByNumeric.get(user);\r
   if(u instanceof User)\r
   {\r