Return-Path: 
 <commits-return-5313-apmail-manifoldcf-commits-archive=manifoldcf.apache.org@manifoldcf.apache.org>
X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org
Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A889010C14
	for <apmail-manifoldcf-commits-archive@www.apache.org>;
 Wed, 11 Dec 2013 15:24:55 +0000 (UTC)
Received: (qmail 40004 invoked by uid 500); 11 Dec 2013 15:24:30 -0000
Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org
Received: (qmail 39728 invoked by uid 500); 11 Dec 2013 15:24:23 -0000
Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@manifoldcf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@manifoldcf.apache.org>
List-Post: <mailto:commits@manifoldcf.apache.org>
List-Id: <commits.manifoldcf.apache.org>
Reply-To: dev@manifoldcf.apache.org
Delivered-To: mailing list commits@manifoldcf.apache.org
Received: (qmail 39693 invoked by uid 99); 11 Dec 2013 15:24:21 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Dec 2013 15:24:21 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Dec 2013 15:24:20 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 0386423889E0;
	Wed, 11 Dec 2013 15:24:00 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1550170 - in /manifoldcf/trunk: ./
 framework/core/src/main/java/org/apache/manifoldcf/core/connectorpool/
 framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/
 framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler...
Date: Wed, 11 Dec 2013 15:23:59 -0000
To: commits@manifoldcf.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20131211152400.0386423889E0@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kwright
Date: Wed Dec 11 15:23:59 2013
New Revision: 1550170

URL: http://svn.apache.org/r1550170
Log:
Fix for CONNECTORS-835.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/connectorpool/ConnectorPool.java
    manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/BaseLockManager.java
    manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperLockManager.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1550170&r1=1550169&r2=1550170&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Dec 11 15:23:59 2013
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 1.5-dev =====================
 
+CONNECTORS-835: Fix busted ZooKeeper implementation.
+(Karl Wright)
+
 CONNECTORS-833: Fix Null Pointer exception in LiveLink connector.
 (David Morana, Karl Wright)
 

Modified: manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/connectorpool/ConnectorPool.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/connectorpool/ConnectorPool.java?rev=1550170&r1=1550169&r2=1550170&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/connectorpool/ConnectorPool.java (original)
+++ manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/connectorpool/ConnectorPool.java Wed Dec 11 15:23:59 2013
@@ -733,20 +733,20 @@ public abstract class ConnectorPool<T ex
   {
     if (data == null || data.length != 8)
       return 0;
-    return ((int)data[0]) & 0xff +
-      (((int)data[1]) << 8) & 0xff00 +
-      (((int)data[2]) << 16) & 0xff0000 +
-      (((int)data[3]) << 24) & 0xff000000;
+    return (((int)data[0]) & 0xff) +
+      ((((int)data[1]) << 8) & 0xff00) +
+      ((((int)data[2]) << 16) & 0xff0000) +
+      ((((int)data[3]) << 24) & 0xff000000);
   }
 
   protected static int unpackInUse(byte[] data)
   {
     if (data == null || data.length != 8)
       return 0;
-    return ((int)data[4]) & 0xff +
-      (((int)data[5]) << 8) & 0xff00 +
-      (((int)data[6]) << 16) & 0xff0000 +
-      (((int)data[7]) << 24) & 0xff000000;
+    return (((int)data[4]) & 0xff) +
+      ((((int)data[5]) << 8) & 0xff00) +
+      ((((int)data[6]) << 16) & 0xff0000) +
+      ((((int)data[7]) << 24) & 0xff000000);
   }
 
   protected static byte[] pack(int target, int inUse)

Modified: manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/BaseLockManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/BaseLockManager.java?rev=1550170&r1=1550169&r2=1550170&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/BaseLockManager.java (original)
+++ manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/BaseLockManager.java Wed Dec 11 15:23:59 2013
@@ -512,10 +512,10 @@ public class BaseLockManager implements 
     byte[] serviceCounterData = readData(serviceCounterName);
     if (serviceCounterData == null || serviceCounterData.length != 4)
       return 0;
-    return ((int)serviceCounterData[0]) & 0xff +
-      (((int)serviceCounterData[1]) << 8) & 0xff00 +
-      (((int)serviceCounterData[2]) << 16) & 0xff0000 +
-      (((int)serviceCounterData[3]) << 24) & 0xff000000;
+    return (((int)serviceCounterData[0]) & 0xff) +
+      ((((int)serviceCounterData[1]) << 8) & 0xff00) +
+      ((((int)serviceCounterData[2]) << 16) & 0xff0000) +
+      ((((int)serviceCounterData[3]) << 24) & 0xff000000);
   }
   
   /** Write service counter.

Modified: manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperLockManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperLockManager.java?rev=1550170&r1=1550169&r2=1550170&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperLockManager.java (original)
+++ manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperLockManager.java Wed Dec 11 15:23:59 2013
@@ -587,13 +587,19 @@ public class ZooKeeperLockManager extend
     int rval;
     byte[] serviceCounterData = connection.readData(serviceCounterName);
     if (serviceCounterData == null || serviceCounterData.length != 4)
+    {
       rval = 0;
+      //System.out.println(" Null or bad data length for service counter '"+serviceCounterName+"'");
+    }
     else
-      rval = ((int)serviceCounterData[0]) & 0xff +
-        (((int)serviceCounterData[1]) << 8) & 0xff00 +
-        (((int)serviceCounterData[2]) << 16) & 0xff0000 +
-        (((int)serviceCounterData[3]) << 24) & 0xff000000;
-    System.out.println("Read service counter '"+serviceCounterName+"'; value = "+rval);
+    {
+      rval = (((int)serviceCounterData[0]) & 0xff) +
+        ((((int)serviceCounterData[1]) << 8) & 0xff00) +
+        ((((int)serviceCounterData[2]) << 16) & 0xff0000) +
+        ((((int)serviceCounterData[3]) << 24) & 0xff000000);
+      //System.out.println(" Read actual data from service counter '"+serviceCounterName+"': "+java.util.Arrays.toString(serviceCounterData));
+    }
+    //System.out.println("Read service counter '"+serviceCounterName+"'; value = "+rval);
     return rval;
   }
   
@@ -608,7 +614,7 @@ public class ZooKeeperLockManager extend
     serviceCounterData[2] = (byte)((counter >> 16) & 0xff);
     serviceCounterData[3] = (byte)((counter >> 24) & 0xff);
     connection.writeData(serviceCounterName,serviceCounterData);
-    System.out.println("Wrote service counter '"+serviceCounterName+"'; value = "+counter);
+    //System.out.println("Wrote service counter '"+serviceCounterName+"'; value = "+counter+": "+java.util.Arrays.toString(serviceCounterData));
   }
 
   /** Build a zk path for the lock for a specific service type.

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java?rev=1550170&r1=1550169&r2=1550170&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java Wed Dec 11 15:23:59 2013
@@ -435,14 +435,14 @@ public class StufferThread extends Threa
     byte[] data = lockManager.readData(stufferThreadLastTimeDatumName);
     if (data == null || data.length != 8)
       return System.currentTimeMillis();
-    long value = ((long)data[0]) & 0xffL +
-      (((long)data[1]) << 8) & 0xff00L +
-      (((long)data[2]) << 16) & 0xff0000L +
-      (((long)data[3]) << 24) & 0xff000000L +
-      (((long)data[4]) << 32) & 0xff00000000L +
-      (((long)data[5]) << 40) & 0xff0000000000L +
-      (((long)data[6]) << 48) & 0xff000000000000L +
-      (((long)data[7]) << 56) & 0xff00000000000000L;
+    long value = (((long)data[0]) & 0xffL) +
+      ((((long)data[1]) << 8) & 0xff00L) +
+      ((((long)data[2]) << 16) & 0xff0000L) +
+      ((((long)data[3]) << 24) & 0xff000000L) +
+      ((((long)data[4]) << 32) & 0xff00000000L) +
+      ((((long)data[5]) << 40) & 0xff0000000000L) +
+      ((((long)data[6]) << 48) & 0xff000000000000L) +
+      ((((long)data[7]) << 56) & 0xff00000000000000L);
     return value;
   }