svn commit: r1625961 - in /manifoldcf/branches/dev_1x: ./ framework/core/src/main/java/org/apache/manifoldcf/core/connectorpool/ framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/

[kwright]

Author: kwright
Date: Thu Sep 18 12:33:01 2014
New Revision: 1625961

URL: http://svn.apache.org/r1625961
Log:
Pull up fix for CONNECTORS-1038 from trunk.

Modified:
    manifoldcf/branches/dev_1x/   (props changed)
    manifoldcf/branches/dev_1x/CHANGES.txt
    
manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/connectorpool/ConnectorPool.java
    
manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperEphemeralNodeObject.java

Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1625957

Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1625961&r1=1625960&r2=1625961&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Thu Sep 18 12:33:01 2014
@@ -3,6 +3,12 @@ $Id$
 
 ======================= 1.8-dev =====================
 
+CONNECTORS-1038: Handle multiple pool closes properly.
+(Karl Wright)
+
+CONNECTORS-956: Change how Solr field name escaping is done.
+(Piergiorgio Lucidi, Shinichiro Abe, Edgardo Ambrosi, Karl Wright)
+
 CONNECTORS-1036: Zookeeper service handling also has
 ephemeral nodes which need to be tied to sessions.
 (Karl Wright)

Modified: 
manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/connectorpool/ConnectorPool.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/connectorpool/ConnectorPool.java?rev=1625961&r1=1625960&r2=1625961&view=diff
==============================================================================
--- 
manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/connectorpool/ConnectorPool.java
 (original)
+++ 
manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/connectorpool/ConnectorPool.java
 Thu Sep 18 12:33:01 2014
@@ -729,10 +729,13 @@ public abstract class ConnectorPool<T ex
       flushUnused(threadContext);
       
       // End service activity
-      isAlive = false;
-      notifyAll();
-      ILockManager lockManager = LockManagerFactory.make(threadContext);
-      lockManager.endServiceActivity(serviceTypeName, serviceName);
+      if (isAlive)
+      {
+        isAlive = false;
+        notifyAll();
+        ILockManager lockManager = LockManagerFactory.make(threadContext);
+        lockManager.endServiceActivity(serviceTypeName, serviceName);
+      }
     }
 
   }

Modified: 
manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperEphemeralNodeObject.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperEphemeralNodeObject.java?rev=1625961&r1=1625960&r2=1625961&view=diff
==============================================================================
--- 
manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperEphemeralNodeObject.java
 (original)
+++ 
manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperEphemeralNodeObject.java
 Thu Sep 18 12:33:01 2014
@@ -81,8 +81,9 @@ public class ZooKeeperEphemeralNodeObjec
     throws ManifoldCFException, InterruptedException
   {
     if (currentConnection == null)
+      throw new IllegalStateException("Can't delete node '"+nodePath+"' that 
we don't own");
       // It's allowed to delete the same node multiple times
-      return;
+      //return;
     
     currentConnection.deleteNode();
     pool.release(currentConnection);