Author: markt
Date: Tue Aug 5 13:02:54 2014
New Revision: 1615922
URL: http://svn.apache.org/r1615922
Log:
Don't use Java 7 methods in Tomcat 7.
Modified:
tomcat/tc7.0.x/trunk/java/javax/el/Util.java
tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java
Modified: tomcat/tc7.0.x/trunk/java/javax/el/Util.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/el/Util.java?rev=1615922&r1=1615921&r2=1615922&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/el/Util.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/el/Util.java Tue Aug 5 13:02:54 2014
@@ -778,7 +778,13 @@ class Util {
// doesn't matter which one we pick as long as we pick
// one. That said, pick the 'right' one (the non-bridge
// one) anyway.
- return Boolean.compare(o.isBridge(), this.isBridge());
+ if (o.isBridge() && !this.isBridge()) {
+ return 1;
+ } else if (!o.isBridge() && this.isBridge()) {
+ return -1;
+ } else {
+ return 0;
+ }
}
}
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java?rev=1615922&r1=1615921&r2=1615922&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java Tue Aug 5
13:02:54 2014
@@ -497,7 +497,13 @@ public class ReflectionUtil {
// doesn't matter which one we pick as long as we pick
// one. That said, pick the 'right' one (the non-bridge
// one) anyway.
- return Boolean.compare(o.isBridge(), this.isBridge());
+ if (o.isBridge() && !this.isBridge()) {
+ return 1;
+ } else if (!o.isBridge() && this.isBridge()) {
+ return -1;
+ } else {
+ return 0;
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
