svn commit: r1833705 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java

[pauls]

Author: pauls
Date: Mon Jun 18 11:51:37 2018
New Revision: 1833705

URL: http://svn.apache.org/viewvc?rev=1833705&view=rev
Log:
FELIX-5800: Fix a small bug when calculating osgi.ee on > java9.

Modified:
    
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java

Modified: 
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java?rev=1833705&r1=1833704&r2=1833705&view=diff
==============================================================================
--- 
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java 
(original)
+++ 
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java 
Mon Jun 18 11:51:37 2018
@@ -107,22 +107,22 @@ public class Util
                 StringBuilder eecap = new StringBuilder(", osgi.ee; 
osgi.ee=\"OSGi/Minimum\"; version:List<Version>=\"1.0,1.1,1.2\",osgi.ee; 
osgi.ee=\"JavaSE\"; 
version:List<Version>=\"1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9");
                 for (int i = 10; i <= version.getMajor();i++)
                 {
-                    
eecap.append(',').append(Integer.toString(version.getMajor()));
+                    eecap.append(',').append(Integer.toString(i));
                 }
                 eecap.append("\",osgi.ee; osgi.ee=\"JavaSE/compact1\"; 
version:List<Version>=\"1.8,9");
                 for (int i = 10; i <= version.getMajor();i++)
                 {
-                    
eecap.append(',').append(Integer.toString(version.getMajor()));
+                    eecap.append(',').append(Integer.toString(i));
                 }
                 eecap.append("\",osgi.ee; osgi.ee=\"JavaSE/compact2\"; 
version:List<Version>=\"1.8,9");
                 for (int i = 10; i <= version.getMajor();i++)
                 {
-                    
eecap.append(',').append(Integer.toString(version.getMajor()));
+                    eecap.append(',').append(Integer.toString(i));
                 }
                 eecap.append("\",osgi.ee; osgi.ee=\"JavaSE/compact3\"; 
version:List<Version>=\"1.8,9");
                 for (int i = 10; i <= version.getMajor();i++)
                 {
-                    
eecap.append(',').append(Integer.toString(version.getMajor()));
+                    eecap.append(',').append(Integer.toString(i));
                 }
                 eecap.append("\"");