I put openjpa 2.3.0 back cause it would be great to avoid to depend on snapshot while we don't really need it. In particular since somebody will surely want to release 1.6.1 quickly ;)
Romain Manni-Bucau Twitter: @rmannibucau Blog: http://rmannibucau.wordpress.com/ LinkedIn: http://fr.linkedin.com/in/rmannibucau Github: https://github.com/rmannibucau ---------- Forwarded message ---------- From: <[email protected]> Date: 2013/12/1 Subject: svn commit: r1546844 - in /tomee/tomee/trunk: pom.xml tck/bval-tomee/pom.xml tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java To: [email protected] Author: rmannibucau Date: Sun Dec 1 19:49:37 2013 New Revision: 1546844 URL: http://svn.apache.org/r1546844 Log: whatever say PMD or sonar it is always better to get a working code ;). Fixing LazyStopWebappClassLoader Modified: tomee/tomee/trunk/pom.xml tomee/tomee/trunk/tck/bval-tomee/pom.xml tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java Modified: tomee/tomee/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1546844&r1=1546843&r2=1546844&view=diff ============================================================================== --- tomee/tomee/trunk/pom.xml (original) +++ tomee/tomee/trunk/pom.xml Sun Dec 1 19:49:37 2013 @@ -93,7 +93,7 @@ <openejb.version>4.6.1-SNAPSHOT</openejb.version> <tomee.version>1.6.1-SNAPSHOT</tomee.version> - <openjpa.version>2.4.0-SNAPSHOT</openjpa.version> + <openjpa.version>2.3.0</openjpa.version> <org.apache.openwebbeans.version>1.2.1</org.apache.openwebbeans.version> <!-- Maven module versions --> Modified: tomee/tomee/trunk/tck/bval-tomee/pom.xml URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/bval-tomee/pom.xml?rev=1546844&r1=1546843&r2=1546844&view=diff ============================================================================== --- tomee/tomee/trunk/tck/bval-tomee/pom.xml (original) +++ tomee/tomee/trunk/tck/bval-tomee/pom.xml Sun Dec 1 19:49:37 2013 @@ -173,7 +173,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> + <artifactId>maven-surefire-plugin</artifactId> <version>2.13</version> <configuration> <useFile>false</useFile> @@ -242,6 +242,7 @@ <configuration> <target> <delete dir="${openejb.home}/webapps/docs" /> + <delete dir="${openejb.home}/webapps/ROOT" /> <delete dir="${openejb.home}/webapps/manager" /> <delete dir="${openejb.home}/webapps/host-manager" /> <replace file="${openejb.home}/conf/server.xml" token="8080" value="${tomee.http.port}" /> Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java?rev=1546844&r1=1546843&r2=1546844&view=diff ============================================================================== --- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java (original) +++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java Sun Dec 1 19:49:37 2013 @@ -211,11 +211,12 @@ public class LazyStopWebappClassLoader e } @Override - public int hashCode() { - int result = (restarting ? 1 : 0); - result = 31 * result + (forceStopPhase ? 1 : 0); - result = 31 * result + (configurer != null ? configurer.hashCode() : 0); - return result; + public int hashCode() { // could be improved a bit adding the host and ensuring contextName != null, an alternative is getURLs() but it is longer + final String name = getContextName(); + if (name != null) { + return name.hashCode(); + } + return super.hashCode(); } @Override
