jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1161056 - /jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java
Date Wed, 24 Aug 2011 11:42:48 GMT
Author: mduerig
Date: Wed Aug 24 11:42:47 2011
New Revision: 1161056

URL: http://svn.apache.org/viewvc?rev=1161056&view=rev
Log:
Microkernel based Jackrabbit prototype (WIP)
- uuid handling

Modified:
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java?rev=1161056&r1=1161055&r2=1161056&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java
Wed Aug 24 11:42:47 2011
@@ -514,11 +514,14 @@ public class RepositoryServiceImpl exten
             return path;
         }
 
+        // todo: make uuid more stable
+        Path basePath = Paths.stringToPath(PathUtils.isAbsolute(uid) ? uid : '/' + uid);
         if (path == null) {
-            return Paths.stringToPath(uid);
+            return basePath;
+        }
+        else {
+            return PathFactoryImpl.getInstance().create(basePath, path, true);
         }
-
-        return PathFactoryImpl.getInstance().create(Paths.stringToPath(uid), path, true);
     }
 
     private static SubscriptionImpl subscription(Subscription subscription) throws RepositoryException
{



Mime
View raw message