Author: areshetnyak Date: 2010-01-18 08:53:38 -0500 (Mon, 18 Jan 2010) New Revision: 1463 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockData.java jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/LockData.java Log: EXOJCR-411 : The calculation TimeToDeath in LockData was fixed. Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockData.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockData.java 2010-01-18 13:11:08 UTC (rev 1462) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockData.java 2010-01-18 13:53:38 UTC (rev 1463) @@ -101,7 +101,7 @@ this.owner = owner; this.timeOut = timeOut; this.live = true; - this.birthday = System.currentTimeMillis() / 1000; + this.birthday = System.currentTimeMillis(); } /** @@ -166,7 +166,7 @@ */ public long getTimeToDeath() { - return birthday + timeOut - System.currentTimeMillis() / 1000; + return birthday + timeOut - System.currentTimeMillis(); } /* Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/LockData.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/LockData.java 2010-01-18 13:11:08 UTC (rev 1462) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/LockData.java 2010-01-18 13:53:38 UTC (rev 1463) @@ -100,7 +100,7 @@ this.sessionScoped = sessionScoped; this.owner = owner; this.timeOut = timeOut; - this.birthday = System.currentTimeMillis() / 1000; + this.birthday = System.currentTimeMillis(); } /* @@ -142,7 +142,7 @@ */ public long getTimeToDeath() { - return birthday + timeOut - System.currentTimeMillis() / 1000; + return birthday + timeOut - System.currentTimeMillis(); } public String getTokenHash()