You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/04/27 07:19:45 UTC
svn commit: r1331221 -
/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
Author: dblevins
Date: Fri Apr 27 05:19:45 2012
New Revision: 1331221
URL: http://svn.apache.org/viewvc?rev=1331221&view=rev
Log:
hopefully avoids "inconvertible types" issue in windows ci build
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1331221&r1=1331220&r2=1331221&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java Fri Apr 27 05:19:45 2012
@@ -196,7 +196,9 @@ public abstract class TomEEContainer<Con
HTTPContext httpContext = new HTTPContext(LOCALHOST, configuration.getHttpPort());
String arquillianServlet;
- if (archive instanceof WebArchive) {
+ // Avoids "inconvertible types" error in windows build
+ final Object object = archive;
+ if (object instanceof WebArchive) {
arquillianServlet = "/" + getArchiveNameWithoutExtension(archive);
} else {
arquillianServlet = "/arquillian-protocol";