svn commit: r1433481 - in /accumulo/branches/1.4: ./ src/ src/core/ src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java src/server/ src/server/src/

[ecn]

Author: ecn
Date: Tue Jan 15 16:06:12 2013
New Revision: 1433481

URL: http://svn.apache.org/viewvc?rev=1433481&view=rev
Log:
ACCUMULO-965 merge to 1.4

Modified:
    accumulo/branches/1.4/   (props changed)
    accumulo/branches/1.4/src/   (props changed)
    accumulo/branches/1.4/src/core/   (props changed)
    
accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java
    accumulo/branches/1.4/src/server/   (props changed)
    accumulo/branches/1.4/src/server/src/   (props changed)

Propchange: accumulo/branches/1.4/
------------------------------------------------------------------------------
  Merged /accumulo/trunk:r1433477

Propchange: accumulo/branches/1.4/src/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1433477

Propchange: accumulo/branches/1.4/src/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/core:r1433477

Modified: 
accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java?rev=1433481&r1=1433480&r2=1433481&view=diff
==============================================================================
--- 
accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java
 (original)
+++ 
accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java
 Tue Jan 15 16:06:12 2013
@@ -16,6 +16,8 @@
  */
 package org.apache.accumulo.core.zookeeper;
 
+import java.math.BigInteger;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -61,7 +63,7 @@ public class ZooUtil {
       else
         path = root + "/" + sa[0].substring(0, lastSlash);
       node = sa[0].substring(lastSlash + 1);
-      eid = Long.parseLong(sa[1], 16);
+      eid = new BigInteger(sa[1], 16).longValue();
     }
     
     public LockID(String path, String node, long eid) {

Propchange: accumulo/branches/1.4/src/server/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/server:r1433477

Propchange: accumulo/branches/1.4/src/server/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 15 16:06:12 2013
@@ -0,0 +1,8 @@
+/accumulo/branches/1.3/src/server/src:1309369,1328076,1330246,1330264,1349971,1354669
+/accumulo/branches/1.4/src/server/src:1356400
+/accumulo/branches/1.4.2/src/server/src:1399210,1402681
+/accumulo/branches/ACCUMULO-672/server/src:1359163
+/accumulo/trunk/fate/src:1433477
+/accumulo/trunk/server/src:1329425,1332224,1332278,1332347,1333047,1333070,1337210,1341000,1342452,1344302,1344358,1350779,1351691,1356400,1359721,1397746,1397928,1397975,1397990,1398090,1423994,1424036,1424115,1426302
+/accumulo/trunk/src/server/src:1329425,1332224,1332278,1332347,1333047,1333070,1341000,1342373,1350779,1351691,1356400,1359721,1397746,1397928,1397975,1397990,1398290,1415914,1423994,1424036,1424050,1424060,1424099,1424115,1426302
+/incubator/accumulo/branches/1.4.0rc/src/server/src:1304025,1305326