[jboss-svn-commits] JBoss Common SVN: r3079 - jboss-logmanager/trunk/src/main/java/org/jboss/logmanager.

[jboss-svn-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2009-03-12 23:29:48 -0400 (Thu, 12 Mar 2009)
New Revision: 3079

Modified:
   jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/Logger.java
Log:
Simplify the removeHandler code a bit

Modified: jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/Logger.java
===================================================================
--- jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/Logger.java	2009-03-13 03:16:23 UTC (rev 3078)
+++ jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/Logger.java	2009-03-13 03:29:48 UTC (rev 3079)
@@ -239,20 +239,13 @@
                     return;
                 }
             } else {
-                Arrays.binarySearch(oldHandlers, handler, IHC_COMPARATOR);
-                int idx = -1;
-                for (int i = 0; i < len; i++) {
-                    if (oldHandlers[i] == handler) {
-                        idx = i;
-                        break;
-                    }
-                }
-                if (idx == -1) {
+                final int pos = Arrays.binarySearch(oldHandlers, handler, IHC_COMPARATOR);
+                if (pos < 0) {
                     return;
                 }
                 newHandlers = new Handler[len - 1];
-                System.arraycopy(oldHandlers, 0, newHandlers, 0, idx);
-                System.arraycopy(oldHandlers, idx + 1, newHandlers, idx, len - idx - 1);
+                System.arraycopy(oldHandlers, 0, newHandlers, 0, pos);
+                System.arraycopy(oldHandlers, pos + 1, newHandlers, pos, len - pos - 1);
             }
             ok = handlersUpdater.compareAndSet(this, oldHandlers, newHandlers);
         } while (! ok);