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 2017/06/01 13:11:03 UTC

svn commit: r1797221 - in /sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser: Analyser.java tasks/CheckBundlesForInitialContent.java

Author: cziegeler
Date: Thu Jun  1 13:11:03 2017
New Revision: 1797221

URL: http://svn.apache.org/viewvc?rev=1797221&view=rev
Log:
Update analyser

Modified:
    sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java
    sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/CheckBundlesForInitialContent.java

Modified: sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java?rev=1797221&r1=1797220&r2=1797221&view=diff
==============================================================================
--- sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java (original)
+++ sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java Thu Jun  1 13:11:03 2017
@@ -218,11 +218,9 @@ public class Analyser {
         defaultMap.put("java.specification.version",
                 System.getProperty("java.specification.version", "1.8"));
         for(final Object name : defaultMap.keySet()) {
-            if ( frameworkProps.get(name.toString()) != null ) {
-                final String value = (String)defaultMap.get(name);
-                final String substValue = substVars(value, name.toString(), null, defaultMap);
-                frameworkProps.put(name.toString(), substValue);
-            }
+            final String value = (String)defaultMap.get(name);
+            final String substValue = substVars(value, name.toString(), null, defaultMap);
+            frameworkProps.put(name.toString(), substValue);
         }
 
         return frameworkProps;

Modified: sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/CheckBundlesForInitialContent.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/CheckBundlesForInitialContent.java?rev=1797221&r1=1797220&r2=1797221&view=diff
==============================================================================
--- sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/CheckBundlesForInitialContent.java (original)
+++ sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/tasks/CheckBundlesForInitialContent.java Thu Jun  1 13:11:03 2017
@@ -33,7 +33,7 @@ public class CheckBundlesForInitialConte
     public void execute(final AnalyserTaskContext ctx) {
         // check for initial content
         for(final BundleInfo info : ctx.getBundleInfos()) {
-            if ( info.getInitialContent() != null ) {
+            if ( !info.getInitialContent().isEmpty() ) {
                 ctx.reportWarning("Found initial content in " + info.getArtifact() + " : " + info.getInitialContent());
             }
         }