From 7e733c645cc127a2eca2b4a3ef320c97e98e606a Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 21 Jan 2007 23:13:38 +0000 Subject: [PATCH] more conflict resolution darcs-hash:20070121231338-5007d-c431d39ed245a906e56207d712b5ebdc08cef150.gz --- src/org/ibex/mail/protocol/NNTP.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/org/ibex/mail/protocol/NNTP.java b/src/org/ibex/mail/protocol/NNTP.java index 55d2136..c4155fd 100644 --- a/src/org/ibex/mail/protocol/NNTP.java +++ b/src/org/ibex/mail/protocol/NNTP.java @@ -111,15 +111,9 @@ 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())); } -- 1.7.10.4