You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2014/07/28 08:57:15 UTC

svn commit: r1613893 - in /sling/trunk/bundles/jcr/webconsole/src/main/java/org/apache/sling/jcr/webconsole/internal: DescriptorsConfigurationPrinter.java NamespaceConfigurationPrinter.java NodeTypeConfigurationPrinter.java

Author: cziegeler
Date: Mon Jul 28 06:57:14 2014
New Revision: 1613893

URL: http://svn.apache.org/r1613893
Log:
3801 : Fields for dynamic references must be volatile

Modified:
    sling/trunk/bundles/jcr/webconsole/src/main/java/org/apache/sling/jcr/webconsole/internal/DescriptorsConfigurationPrinter.java
    sling/trunk/bundles/jcr/webconsole/src/main/java/org/apache/sling/jcr/webconsole/internal/NamespaceConfigurationPrinter.java
    sling/trunk/bundles/jcr/webconsole/src/main/java/org/apache/sling/jcr/webconsole/internal/NodeTypeConfigurationPrinter.java

Modified: sling/trunk/bundles/jcr/webconsole/src/main/java/org/apache/sling/jcr/webconsole/internal/DescriptorsConfigurationPrinter.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webconsole/src/main/java/org/apache/sling/jcr/webconsole/internal/DescriptorsConfigurationPrinter.java?rev=1613893&r1=1613892&r2=1613893&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/webconsole/src/main/java/org/apache/sling/jcr/webconsole/internal/DescriptorsConfigurationPrinter.java (original)
+++ sling/trunk/bundles/jcr/webconsole/src/main/java/org/apache/sling/jcr/webconsole/internal/DescriptorsConfigurationPrinter.java Mon Jul 28 06:57:14 2014
@@ -43,7 +43,7 @@ public class DescriptorsConfigurationPri
 
 
     @Reference(policy=ReferencePolicy.DYNAMIC)
-    private SlingRepository slingRepository;
+    private volatile SlingRepository slingRepository;
 
     /**
      * Get the title of the configuration status page.

Modified: sling/trunk/bundles/jcr/webconsole/src/main/java/org/apache/sling/jcr/webconsole/internal/NamespaceConfigurationPrinter.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webconsole/src/main/java/org/apache/sling/jcr/webconsole/internal/NamespaceConfigurationPrinter.java?rev=1613893&r1=1613892&r2=1613893&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/webconsole/src/main/java/org/apache/sling/jcr/webconsole/internal/NamespaceConfigurationPrinter.java (original)
+++ sling/trunk/bundles/jcr/webconsole/src/main/java/org/apache/sling/jcr/webconsole/internal/NamespaceConfigurationPrinter.java Mon Jul 28 06:57:14 2014
@@ -49,7 +49,7 @@ public class NamespaceConfigurationPrint
 
 
     @Reference(policy=ReferencePolicy.DYNAMIC)
-    private SlingRepository slingRepository;
+    private volatile SlingRepository slingRepository;
 
     /**
      * Get the title of the configuration status page.

Modified: sling/trunk/bundles/jcr/webconsole/src/main/java/org/apache/sling/jcr/webconsole/internal/NodeTypeConfigurationPrinter.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webconsole/src/main/java/org/apache/sling/jcr/webconsole/internal/NodeTypeConfigurationPrinter.java?rev=1613893&r1=1613892&r2=1613893&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/webconsole/src/main/java/org/apache/sling/jcr/webconsole/internal/NodeTypeConfigurationPrinter.java (original)
+++ sling/trunk/bundles/jcr/webconsole/src/main/java/org/apache/sling/jcr/webconsole/internal/NodeTypeConfigurationPrinter.java Mon Jul 28 06:57:14 2014
@@ -5,9 +5,9 @@
  * licenses this file to You under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -19,8 +19,8 @@ package org.apache.sling.jcr.webconsole.
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 import java.util.Comparator;
+import java.util.List;
 
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
@@ -56,11 +56,11 @@ import org.apache.sling.jcr.api.SlingRep
 public class NodeTypeConfigurationPrinter implements ModeAwareConfigurationPrinter {
 
     @Reference(policy = ReferencePolicy.DYNAMIC)
-    private SlingRepository slingRepository;
+    private volatile SlingRepository slingRepository;
 
     /**
      * Get the title of the configuration status page.
-     * 
+     *
      * @return the title
      */
     public String getTitle() {
@@ -175,7 +175,7 @@ public class NodeTypeConfigurationPrinte
 
     /**
      * Output a list of node types from the NamespaceRegistry.
-     * 
+     *
      * @param pw a PrintWriter
      */
     public void printConfiguration(PrintWriter pw) {