[tomcat] branch 7.0.x updated: Correct backport for Java 6

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
     new bd4f326  Correct backport for Java 6
bd4f326 is described below

commit bd4f3267d1ac0894029c652ad11e6ad15b3344e5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Apr 10 12:37:53 2019 +0100

    Correct backport for Java 6
---
 .../apache/catalina/servlets/TestCGIServletCmdLineArguments.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/test/org/apache/catalina/servlets/TestCGIServletCmdLineArguments.java 
b/test/org/apache/catalina/servlets/TestCGIServletCmdLineArguments.java
index 16398c2..15f4d16 100755
--- a/test/org/apache/catalina/servlets/TestCGIServletCmdLineArguments.java
+++ b/test/org/apache/catalina/servlets/TestCGIServletCmdLineArguments.java
@@ -28,7 +28,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameter;
 
-import org.apache.tomcat.util.compat.JrePlatform;
+import org.apache.naming.resources.JrePlatform;
 
 @RunWith(Parameterized.class)
 public class TestCGIServletCmdLineArguments {
@@ -50,7 +50,9 @@ public class TestCGIServletCmdLineArguments {
                 Field f = 
CGIServlet.class.getDeclaredField("cmdLineArgumentsDecodedPattern");
                 f.setAccessible(true);
                 p = (Pattern) f.get(cgiServlet);
-            } catch (IllegalAccessException | NoSuchFieldException | 
SecurityException e) {
+            } catch (IllegalAccessException e) {
+            } catch (NoSuchFieldException e) {
+            } catch (SecurityException e) {
             }
 
             Assert.assertEquals(defaultDecodedPatternWindows, p);
@@ -59,7 +61,7 @@ public class TestCGIServletCmdLineArguments {
 
     @Parameterized.Parameters(name = "{index}: argument[{0}], allowed[{1}]")
     public static Collection<Object[]> parameters() {
-        List<Object[]> params = new ArrayList<>();
+        List<Object[]> params = new ArrayList<Object[]>();
         params.add(new Object[] { "", Boolean.FALSE } );
         params.add(new Object[] { "<", Boolean.FALSE } );
         params.add(new Object[] { "\"", Boolean.FALSE } );


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