commit 514c2591607d00acdeac74964964e63d77998b93
author Guillaume Nodet <gnodet@apache.org> Wed Oct 14 19:02:04 2009 +0000
committer Guillaume Nodet <gnodet@apache.org> Wed Oct 14 19:02:04 2009 +0000
tree f3f790764093808fcbe1e9d43be85071c1d6b766
parent 9e2b66646cdfa0d486b97b69766657a1dd4de0b7

FELIX-1723: [karaf] slave instances on same host as master instance does not properly lock

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@825220 13f79535-47bb-0310-9956-ffa450edef68

karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java

diff --git a/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java b/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
index 3196d57..0e8505b 100644
--- a/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
+++ b/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
@@ -126,7 +126,7 @@
             long time = System.currentTimeMillis();
             statement = lockConnection.prepareStatement(statements.getLockUpdateStatement(time));
             int rows = statement.executeUpdate();
-            if (rows == 1) {
+            if (rows >= 1) {
                 result=true;
             }
         } catch (Exception e) {
@@ -168,7 +168,7 @@
             long time = System.currentTimeMillis();
             statement = lockConnection.prepareStatement(statements.getLockUpdateStatement(time));
             int rows = statement.executeUpdate();
-            if (rows != 1) {
+            if (rows < 1) {
                 result = false;
             }
         } catch (Exception ex) {