Author: gnodet
Date: Wed Oct 14 19:02:04 2009
New Revision: 825220
URL: http://svn.apache.org/viewvc?rev=825220&view=rev
Log:
FELIX-1723: [karaf] slave instances on same host as master instance does not
properly lock
Modified:
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
Modified:
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java?rev=825220&r1=825219&r2=825220&view=diff
==============================================================================
---
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
(original)
+++
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
Wed Oct 14 19:02:04 2009
@@ -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) {
