You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jackrabbit.apache.org by an...@apache.org on 2007/10/26 16:32:50 UTC

svn commit: r588662 - /jackrabbit/sandbox/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerRepositoryService.java

Author: angela
Date: Fri Oct 26 07:32:49 2007
New Revision: 588662

URL: http://svn.apache.org/viewvc?rev=588662&view=rev
Log:
JCR-1159 SPI: improve description of locking methods on RepositoryService -> fix code in spi-rmi (return value of getLockInfo)

Modified:
    jackrabbit/sandbox/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerRepositoryService.java

Modified: jackrabbit/sandbox/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerRepositoryService.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerRepositoryService.java?rev=588662&r1=588661&r2=588662&view=diff
==============================================================================
--- jackrabbit/sandbox/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerRepositoryService.java (original)
+++ jackrabbit/sandbox/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerRepositoryService.java Fri Oct 26 07:32:49 2007
@@ -447,7 +447,7 @@
         try {
             LockInfo lockInfo = service.getLockInfo(
                     getSessionInfo(sessionInfo), nodeId);
-            if (lockInfo instanceof Serializable) {
+            if (lockInfo == null || lockInfo instanceof Serializable) {
                 return lockInfo;
             } else {
                 NodeId id = lockInfo.getNodeId();