tdraier 2005/10/10 17:36:34 CEST
Modified files:
core/src/java/org/jahia/services/lock LockKey.java
Log:
fixed strange lock issue
Revision Changes Path
1.4 +11 -7 jahia/core/src/java/org/jahia/services/lock/LockKey.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/lock/LockKey.java.diff?r1=1.3&r2=1.4&f=h
Index: LockKey.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/lock/LockKey.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LockKey.java 5 Aug 2005 13:58:20 -0000 1.3
+++ LockKey.java 10 Oct 2005 15:36:33 -0000 1.4
@@ -128,13 +128,17 @@
}
public static LockKey composeLockKey(final String lockKeyStr) {
- final StringTokenizer lockKeyToken = new StringTokenizer(lockKeyStr,
"_");
- final String action = lockKeyToken.nextToken();
- if (!lockKeyToken.hasMoreTokens()) return null;
- final String name = lockKeyToken.nextToken();
- if (!lockKeyToken.hasMoreTokens()) return null;
- final int id = Integer.parseInt(lockKeyToken.nextToken());
- return new LockKey(name, id, action, -1);
+ try {
+ final StringTokenizer lockKeyToken = new
StringTokenizer(lockKeyStr, "_");
+ final String action = lockKeyToken.nextToken();
+ if (!lockKeyToken.hasMoreTokens()) return null;
+ final String name = lockKeyToken.nextToken();
+ if (!lockKeyToken.hasMoreTokens()) return null;
+ final int id = Integer.parseInt(lockKeyToken.nextToken());
+ return new LockKey(name, id, action, -1);
+ } catch (NumberFormatException e) {
+ return null;
+ }
}
public boolean equals(final Object obj) {
