svn commit: r1837649 - in /felix/trunk/systemready/src/main/java/org/apache/felix/systemready: Status.java impl/FrameworkStartCheck.java

[cs...@apache.org]

Author: cschneider
Date: Wed Aug  8 13:02:56 2018
New Revision: 1837649

URL: http://svn.apache.org/viewvc?rev=1837649&view=rev
Log:
FELIX-5903 - Fix default FrameworkStartCheck in bndtools

Removed:
    felix/trunk/systemready/src/main/java/org/apache/felix/systemready/Status.java
Modified:
    felix/trunk/systemready/src/main/java/org/apache/felix/systemready/impl/FrameworkStartCheck.java

Modified: felix/trunk/systemready/src/main/java/org/apache/felix/systemready/impl/FrameworkStartCheck.java
URL: http://svn.apache.org/viewvc/felix/trunk/systemready/src/main/java/org/apache/felix/systemready/impl/FrameworkStartCheck.java?rev=1837649&r1=1837648&r2=1837649&view=diff
==============================================================================
--- felix/trunk/systemready/src/main/java/org/apache/felix/systemready/impl/FrameworkStartCheck.java (original)
+++ felix/trunk/systemready/src/main/java/org/apache/felix/systemready/impl/FrameworkStartCheck.java Wed Aug  8 13:02:56 2018
@@ -57,7 +57,7 @@ public class FrameworkStartCheck impleme
         long timeout() default 1000;
 
         @AttributeDefinition(name = "Target start level", description = "The target start level at which the Framework " +
-                "is considered started. If zero or negative, it will default to the default bundle start level + 1")
+                "is considered started. If zero or negative, it will default to the default bundle start level")
         int target_start_level() default 0;
 
         @AttributeDefinition(name = "Target start level OSGi property name",
@@ -88,7 +88,7 @@ public class FrameworkStartCheck impleme
 		final FrameworkStartLevel fsl = bundleContext.getBundle(Constants.SYSTEM_BUNDLE_ID).adapt(FrameworkStartLevel.class);
         final long initial = fsl.getInitialBundleStartLevel();
         // get the configured target start level, otherwise use the initial bundle start level
-        long tStartLevel = config.target_start_level() > 0 ? config.target_start_level() : initial + 1;
+        long tStartLevel = config.target_start_level() > 0 ? config.target_start_level() : initial;
 
         // overwrite with the value from #target_start_level_prop_name if present
         final String targetStartLevelKey = config.target_start_level_prop_name();