conflict resolution

darcs-hash:20070121231236-5007d-001e52740ec9db93e39403ff5898a37bfd4dfc22.gz

diff --git a/src/org/ibex/mail/protocol/NNTP.java b/src/org/ibex/mail/protocol/NNTP.java
index 523c6ea..55d2136 100644 (file)
--- a/src/org/ibex/mail/protocol/NNTP.java
+++ b/src/org/ibex/mail/protocol/NNTP.java
@@ -65,8 +65,7 @@ public class NNTP {
         public MailboxWrapper(Mailbox root, boolean post) { this.root = root; this.post = post; }
         public boolean  postok() { return post; }
         public void     post(Message m) throws IOException { current.accept(m); }
-
-        public Group    group(String s)         {
+        public Group    group(String s) {
             ptr = 0;
             Group g = getgroup(s);
             if (g==null) return null;
@@ -112,7 +111,15 @@ public class NNTP {
         }
         private Group getgroup(String s) {
             Mailbox box = root;
+v v v v v v v
+            Log.error("", "getgroup " + s);
+            Log.error("", "mailbox " + root);
             for(StringTokenizer st = new StringTokenizer(s, "."); box!=null && st.hasMoreTokens(); box = box.slash(st.nextToken(), false));
+*************
+            for(StringTokenizer st = new StringTokenizer(s, ".");
+                box!=null && st.hasMoreTokens();
+                box = box.slash(st.nextToken(), false));
+^ ^ ^ ^ ^ ^ ^
             if (box==null) return null;
             return new Group(s, true, 1, box.count(Query.all()), box.count(Query.all()));
         }

diff --git a/src/org/ibex/mail/target/FileBasedMailbox.java b/src/org/ibex/mail/target/FileBasedMailbox.java
index 3f198d0..4fc5176 100644 (file)
--- a/src/org/ibex/mail/target/FileBasedMailbox.java
+++ b/src/org/ibex/mail/target/FileBasedMailbox.java
@@ -74,7 +74,8 @@ public class FileBasedMailbox extends Mailbox.Default {
         String[] files = path.list();
         for(int i=0; i<files.length; i++) {
             try {
-                if (files[i].indexOf('.') != -1) files[i] = files[i].substring(0, files[i].indexOf('.'));
+                if (files[i].indexOf('.') <= 0) continue;
+                files[i] = files[i].substring(0, files[i].indexOf('.'));
                 int n = Integer.parseInt(files[i]);
                 if (n>=uidNext) uidNext = n;
             } catch(Exception e) { Log.error(this, e); }