svn commit: r1775098 - /sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/loader/Loader.java

[cziegeler]

Author: cziegeler
Date: Mon Dec 19 14:06:05 2016
New Revision: 1775098

URL: http://svn.apache.org/viewvc?rev=1775098&view=rev
Log:
SLING-6402 : Remove loginAdministrative() usage from jcr base

Modified:
    
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/loader/Loader.java

Modified: 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/loader/Loader.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/loader/Loader.java?rev=1775098&r1=1775097&r2=1775098&view=diff
==============================================================================
--- 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/loader/Loader.java
 (original)
+++ 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/loader/Loader.java
 Mon Dec 19 14:06:05 2016
@@ -190,7 +190,7 @@ public class Loader implements BundleLis
      * @param bundle The bundle.
      */
     private void registerNamespaces(final Bundle bundle) throws 
RepositoryException {
-        final String definition = (String) 
bundle.getHeaders().get(NAMESPACES_BUNDLE_HEADER);
+        final String definition = 
bundle.getHeaders().get(NAMESPACES_BUNDLE_HEADER);
         if ( definition != null ) {
             logger.debug("registerNamespaces: Bundle {} tries to register: {}",
                     getBundleIdentifier(bundle), definition);
@@ -241,7 +241,7 @@ public class Loader implements BundleLis
 
     private boolean registerNodeTypes(Bundle bundle, boolean isRetry) throws 
RepositoryException {
         // TODO: define header referring to mapper files
-        String typesHeader = (String) 
bundle.getHeaders().get(NODETYPES_BUNDLE_HEADER);
+        String typesHeader = bundle.getHeaders().get(NODETYPES_BUNDLE_HEADER);
         if (typesHeader == null) {
             // no node types in the bundle, return with success
             logger.debug("registerNodeTypes: Bundle {} has no nodetypes",
@@ -322,8 +322,7 @@ public class Loader implements BundleLis
     }
 
     private Session getSession() throws RepositoryException {
-        // TODO: Should really use loginService !!
-        return this.slingRepository.loginAdministrative(null);
+        return this.slingRepository.loginService(null, null);
     }
 
     private void ungetSession(final Session session) {