Index: jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java
===================================================================
--- jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java	(revision 1800801)
+++ jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java	(working copy)
@@ -354,9 +354,9 @@
         ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
         try {
             final long start = System.currentTimeMillis();
-            final String key = getKeyName(identifier);
             if (minModifiedDate > 0
                 && minModifiedDate > getLastModified(identifier)) {
+                final String key = getKeyName(identifier);
                 CopyObjectRequest copReq = new CopyObjectRequest(bucket, key,
                     bucket, key);
                 copReq.setNewObjectMetadata(new ObjectMetadata());
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ProtectedItemModifier.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ProtectedItemModifier.java	(revision 1800801)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ProtectedItemModifier.java	(working copy)
@@ -76,7 +76,6 @@
         parentImpl.checkSetProperty();
 
         NodeTypeImpl nodeType = parentImpl.sessionContext.getNodeTypeManager().getNodeType(ntName);
-        org.apache.jackrabbit.spi.commons.nodetype.NodeDefinitionImpl def = parentImpl.getApplicableChildNodeDefinition(name, ntName);
 
         // check for name collisions
         // TODO: improve. copied from NodeImpl
@@ -83,6 +82,8 @@
         NodeState thisState = parentImpl.getNodeState();
         ChildNodeEntry cne = thisState.getChildNodeEntry(name, 1);
         if (cne != null) {
+            org.apache.jackrabbit.spi.commons.nodetype.NodeDefinitionImpl def = parentImpl.getApplicableChildNodeDefinition(name, ntName);
+
             // there's already a child node entry with that name;
             // check same-name sibling setting of new node
             if (!def.allowsSameNameSiblings()) {
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java	(revision 1800801)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java	(working copy)
@@ -742,9 +742,9 @@
      * @throws ConfigurationException
      */
     public ImportConfig parseImportConfig(Element parent) throws ConfigurationException {
-        List<BeanConfig> protectedItemImporters = new ArrayList<BeanConfig>();
         Element element = getElement(parent, IMPORT_ELEMENT, false);
         if (element != null) {
+            List<BeanConfig> protectedItemImporters = new ArrayList<BeanConfig>();
             NodeList children = element.getChildNodes();
             for (int i = 0; i < children.getLength(); i++) {
                 Node child = children.item(i);
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventFilter.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventFilter.java	(revision 1800801)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventFilter.java	(working copy)
@@ -169,8 +169,8 @@
         }
 
         // check UUIDs
-        NodeId parentId = eventState.getParentId();
         if (ids != null) {
+            NodeId parentId = eventState.getParentId();
             boolean match = false;
             for (int i = 0; i < ids.length && !match; i++) {
                 match |= parentId.equals(ids[i]);
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/token/CompatTokenProvider.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/token/CompatTokenProvider.java	(revision 1800801)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/token/CompatTokenProvider.java	(working copy)
@@ -200,8 +200,8 @@
     private static String getUserId(NodeImpl tokenNode, UserManager userManager) throws RepositoryException {
         if (tokenNode != null) {
             final NodeImpl userNode = (NodeImpl) tokenNode.getParent().getParent();
-            final String principalName = userNode.getProperty(UserImpl.P_PRINCIPAL_NAME).getString();
             if (userNode.isNodeType(UserImpl.NT_REP_USER)) {
+                final String principalName = userNode.getProperty(UserImpl.P_PRINCIPAL_NAME).getString();
                 Authorizable a = userManager.getAuthorizable(new ItemBasedPrincipal() {
                     public String getPath() throws RepositoryException {
                         return userNode.getPath();
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/token/TokenProvider.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/token/TokenProvider.java	(revision 1800801)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/token/TokenProvider.java	(working copy)
@@ -225,8 +225,8 @@
     static String getUserId(NodeImpl tokenNode, UserManager userManager) throws RepositoryException {
         if (tokenNode != null) {
             final NodeImpl userNode = (NodeImpl) tokenNode.getParent().getParent();
-            final String principalName = userNode.getProperty(UserImpl.P_PRINCIPAL_NAME).getString();
             if (userNode.isNodeType(UserImpl.NT_REP_USER)) {
+                final String principalName = userNode.getProperty(UserImpl.P_PRINCIPAL_NAME).getString();
                 Authorizable a = userManager.getAuthorizable(new ItemBasedPrincipal() {
                     public String getPath() throws RepositoryException {
                         return userNode.getPath();
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLProvider.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLProvider.java	(revision 1800801)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLProvider.java	(working copy)
@@ -123,11 +123,11 @@
         // minimal protection on the root node.
         NodeImpl root = (NodeImpl) session.getRootNode();
         rootNodeId = root.getNodeId();
-        ACLEditor systemEditor = new ACLEditor(session, this, allowUnknownPrincipals);
 
         // TODO: replace by configurable default policy (see JCR-2331)
         boolean initializedWithDefaults = !configuration.containsKey(PARAM_OMIT_DEFAULT_PERMISSIONS);
         if (initializedWithDefaults && !isAccessControlled(root)) {
+            ACLEditor systemEditor = new ACLEditor(session, this, allowUnknownPrincipals);
             initRootACL(session, systemEditor);
         }
 
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/AccessControlImporter.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/AccessControlImporter.java	(revision 1800801)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/AccessControlImporter.java	(working copy)
@@ -224,7 +224,6 @@
             return;
         }
         
-        Name ntName = childInfo.getNodeTypeName();
         int previousStatus = status;
 
         if (!principalbased) {
@@ -232,6 +231,7 @@
             addACE(childInfo, propInfos);
             status = STATUS_ACE;
         } else {
+            Name ntName = childInfo.getNodeTypeName();
             switch (status) {
                 case STATUS_AC_FOLDER:
                     if (NT_REP_ACCESS_CONTROL.equals(ntName)) {