svn commit: r1811318 - in /tomcat/trunk/java/org/apache/tomcat/util/compat: Jre9Compat.java JreCompat.java

[markt]

Author: markt
Date: Fri Oct  6 10:22:03 2017
New Revision: 1811318

URL: http://svn.apache.org/viewvc?rev=1811318&view=rev
Log:
Revert changes included in r1811311 in error

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java
    tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java?rev=1811318&r1=1811317&r2=1811318&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java Fri Oct  6 
10:22:03 2017
@@ -19,11 +19,7 @@ package org.apache.tomcat.util.compat;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.net.URLConnection;
-import java.util.Deque;
-import java.util.Optional;
 
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
@@ -101,19 +97,4 @@ class Jre9Compat extends JreCompat {
             throw new UnsupportedOperationException(e);
         }
     }
-
-
-    @Override
-    public void addClassPath(Deque<URL> classPathUrlsToProcess) {
-        ModuleLayer.boot().configuration().modules().stream().map(
-                rm -> 
rm.reference().location()).flatMap(Optional::stream).map(u -> {
-                    try {
-                        return u.toURL();
-                    } catch (MalformedURLException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                        return null;
-                    }
-                }).forEach(classPathUrlsToProcess::add);
-    }
 }

Modified: tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java?rev=1811318&r1=1811317&r2=1811318&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java Fri Oct  6 
10:22:03 2017
@@ -19,7 +19,6 @@ package org.apache.tomcat.util.compat;
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.Deque;
 
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
@@ -116,16 +115,4 @@ public class JreCompat {
         URLConnection uConn = url.openConnection();
         uConn.setDefaultUseCaches(false);
     }
-
-
-    /**
-     * Scans the module path and adds the locations of each module found to the
-     * queue for URLs to be processed.
-     *
-     * @param classPathUrlsToProcess    The queue of URLs to which found
-     *                                  locations should be added
-     */
-    public void addClassPath(Deque<URL> classPathUrlsToProcess) {
-        // NO-OP unless running on Java 9 or later
-    }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org