tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject [2/2] tomee git commit: style + warning
Date Sun, 22 Feb 2015 15:57:55 GMT
style + warning


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f2c5d344
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f2c5d344
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f2c5d344

Branch: refs/heads/develop
Commit: f2c5d3447c3e99aa62ec4898f1fb79c1c6b679ac
Parents: ae07f53
Author: Romain Manni-Bucau <rmannibucau@apache.org>
Authored: Sun Feb 22 16:57:42 2015 +0100
Committer: Romain Manni-Bucau <rmannibucau@apache.org>
Committed: Sun Feb 22 16:57:42 2015 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/tomee/embedded/Container.java     | 6 +++---
 .../java/org/apache/tomee/embedded/ManualDeploymentTest.java   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/f2c5d344/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
index b8a52d6..6b51e34 100644
--- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
+++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
@@ -176,11 +176,11 @@ public class Container implements AutoCloseable {
                 throw new IllegalArgumentException("The file does not have content");
             }
 
-            List<URL> urls = new ArrayList<URL>();
-            for (File jar : jarList) {
+            final List<URL> urls = new ArrayList<URL>(jarList.length);
+            for (final File jar : jarList) {
                 urls.addAll(asList(jar.toURI().toURL()));
             }
-            return this.deployPathsAsWebapp(null, urls, null);
+            return deployPathsAsWebapp(null, urls, null);
         } catch (final MalformedURLException e) {
             throw new IllegalArgumentException(e);
         }

http://git-wip-us.apache.org/repos/asf/tomee/blob/f2c5d344/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ManualDeploymentTest.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ManualDeploymentTest.java
b/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ManualDeploymentTest.java
index a4583d3..f298ad8 100644
--- a/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ManualDeploymentTest.java
+++ b/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ManualDeploymentTest.java
@@ -54,7 +54,7 @@ public class ManualDeploymentTest {
                     .as(ExplodedExporter.class)
                     .exportExploded(parent);
 
-            final Context ctx = container.addContext("/", war.getAbsolutePath());
+            final Context ctx = container.addContext("", war.getAbsolutePath());
 
             final Wrapper wrapper = Tomcat.addServlet(ctx, "awesome", AServlet.class.getName());
             ctx.addServletMapping("/awesome", wrapper.getName());


Mime
View raw message