You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2017/07/26 14:37:20 UTC
svn commit: r1803055 - in /tomcat/trunk/java/org/apache: catalina/core/
catalina/startup/ coyote/http2/ tomcat/util/descriptor/web/ tomcat/websocket/
Author: remm
Date: Wed Jul 26 14:37:20 2017
New Revision: 1803055
URL: http://svn.apache.org/viewvc?rev=1803055&view=rev
Log:
Fix bit sign checks warnings, no functional change.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java
tomcat/trunk/java/org/apache/coyote/http2/Flags.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java?rev=1803055&r1=1803054&r2=1803055&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java Wed Jul 26 14:37:20 2017
@@ -260,27 +260,27 @@ public final class ApplicationFilterFact
private static boolean matchDispatcher(FilterMap filterMap, DispatcherType type) {
switch (type) {
case FORWARD :
- if ((filterMap.getDispatcherMapping() & FilterMap.FORWARD) > 0) {
- return true;
+ if ((filterMap.getDispatcherMapping() & FilterMap.FORWARD) != 0) {
+ return true;
}
break;
case INCLUDE :
- if ((filterMap.getDispatcherMapping() & FilterMap.INCLUDE) > 0) {
+ if ((filterMap.getDispatcherMapping() & FilterMap.INCLUDE) != 0) {
return true;
}
break;
case REQUEST :
- if ((filterMap.getDispatcherMapping() & FilterMap.REQUEST) > 0) {
+ if ((filterMap.getDispatcherMapping() & FilterMap.REQUEST) != 0) {
return true;
}
break;
case ERROR :
- if ((filterMap.getDispatcherMapping() & FilterMap.ERROR) > 0) {
+ if ((filterMap.getDispatcherMapping() & FilterMap.ERROR) != 0) {
return true;
}
break;
case ASYNC :
- if ((filterMap.getDispatcherMapping() & FilterMap.ASYNC) > 0) {
+ if ((filterMap.getDispatcherMapping() & FilterMap.ASYNC) != 0) {
return true;
}
break;
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1803055&r1=1803054&r2=1803055&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed Jul 26 14:37:20 2017
@@ -2130,7 +2130,7 @@ public class ContextConfig implements Li
}
if ((javaClass.getAccessFlags() &
- org.apache.tomcat.util.bcel.Const.ACC_ANNOTATION) > 0) {
+ org.apache.tomcat.util.bcel.Const.ACC_ANNOTATION) != 0) {
// Skip annotations.
return;
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java?rev=1803055&r1=1803054&r2=1803055&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java Wed Jul 26 14:37:20 2017
@@ -27,7 +27,7 @@ class ByteUtil {
static boolean isBit7Set(byte input) {
- return (input & 0x80) > 0;
+ return (input & 0x80) != 0;
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/Flags.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Flags.java?rev=1803055&r1=1803054&r2=1803055&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Flags.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Flags.java Wed Jul 26 14:37:20 2017
@@ -24,26 +24,26 @@ class Flags {
static boolean isEndOfStream(int flags) {
- return (flags & 0x01) > 0;
+ return (flags & 0x01) != 0;
}
static boolean isAck(int flags) {
- return (flags & 0x01) > 0;
+ return (flags & 0x01) != 0;
}
static boolean isEndOfHeaders(int flags) {
- return (flags & 0x04) > 0;
+ return (flags & 0x04) != 0;
}
static boolean hasPadding(int flags) {
- return (flags & 0x08) > 0;
+ return (flags & 0x08) != 0;
}
static boolean hasPriority(int flags) {
- return (flags & 0x20) > 0;
+ return (flags & 0x20) != 0;
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java?rev=1803055&r1=1803054&r2=1803055&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java Wed Jul 26 14:37:20 2017
@@ -178,19 +178,19 @@ public class FilterMap extends XmlEncodi
public String[] getDispatcherNames() {
List<String> result = new ArrayList<>();
- if ((dispatcherMapping & FORWARD) > 0) {
+ if ((dispatcherMapping & FORWARD) != 0) {
result.add(DispatcherType.FORWARD.name());
}
- if ((dispatcherMapping & INCLUDE) > 0) {
+ if ((dispatcherMapping & INCLUDE) != 0) {
result.add(DispatcherType.INCLUDE.name());
}
- if ((dispatcherMapping & REQUEST) > 0) {
+ if ((dispatcherMapping & REQUEST) != 0) {
result.add(DispatcherType.REQUEST.name());
}
- if ((dispatcherMapping & ERROR) > 0) {
+ if ((dispatcherMapping & ERROR) != 0) {
result.add(DispatcherType.ERROR.name());
}
- if ((dispatcherMapping & ASYNC) > 0) {
+ if ((dispatcherMapping & ASYNC) != 0) {
result.add(DispatcherType.ASYNC.name());
}
return result.toArray(new String[result.size()]);
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java?rev=1803055&r1=1803054&r2=1803055&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java Wed Jul 26 14:37:20 2017
@@ -240,7 +240,7 @@ public class PerMessageDeflate implement
@Override
public boolean validateRsv(int rsv, byte opCode) {
if (Util.isControl(opCode)) {
- if ((rsv & RSV_BITMASK) > 0) {
+ if ((rsv & RSV_BITMASK) != 0) {
return false;
} else {
if (next == null) {
@@ -251,7 +251,7 @@ public class PerMessageDeflate implement
}
} else {
int rsvNext = rsv;
- if ((rsv & RSV_BITMASK) > 0) {
+ if ((rsv & RSV_BITMASK) != 0) {
rsvNext = rsv ^ RSV_BITMASK;
}
if (next == null) {
@@ -300,7 +300,7 @@ public class PerMessageDeflate implement
@Override
public boolean validateRsvBits(int i) {
- if ((i & RSV_BITMASK) > 0) {
+ if ((i & RSV_BITMASK) != 0) {
return false;
}
if (next == null) {
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Util.java?rev=1803055&r1=1803054&r2=1803055&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/Util.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Util.java Wed Jul 26 14:37:20 2017
@@ -69,7 +69,7 @@ public class Util {
static boolean isControl(byte opCode) {
- return (opCode & 0x08) > 0;
+ return (opCode & 0x08) != 0;
}
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1803055&r1=1803054&r2=1803055&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Wed Jul 26 14:37:20 2017
@@ -148,7 +148,7 @@ public abstract class WsFrameBase {
return false;
}
int b = inputBuffer.get();
- fin = (b & 0x80) > 0;
+ fin = (b & 0x80) != 0;
rsv = (b & 0x70) >>> 4;
opCode = (byte) (b & 0x0F);
if (!transformation.validateRsv(rsv, opCode)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1803055 - in /tomcat/trunk/java/org/apache:
catalina/core/ catalina/startup/ coyote/http2/ tomcat/util/descriptor/web/
tomcat/websocket/
Posted by Mark Thomas <ma...@apache.org>.
On 26/07/2017 15:42, Rémy Maucherat wrote:
> On Wed, Jul 26, 2017 at 4:37 PM, <re...@apache.org> wrote:
>
>> Author: remm
>> Date: Wed Jul 26 14:37:20 2017
>> New Revision: 1803055
>>
>> URL: http://svn.apache.org/viewvc?rev=1803055&view=rev
>> Log:
>> Fix bit sign checks warnings, no functional change.
>>
>> To which branches should non functional cleanups like this be backported
> now ?
I'd say assess each one on its merits and back-port it as far as you
think makes sense. If another committer wants to back-port it further
that would be fine too.
My personal view (and what I think I'd do by default) is:
> 8.5: yes
+1
> 8.0: no because of planned EOL ?
Probably not. But if there is a possibility of a bug I probably would.
> 7.0: yes ?
Probably, unless the back-port was complex and the issue cosmetic.
> 6.0: no
+1
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1803055 - in /tomcat/trunk/java/org/apache:
catalina/core/ catalina/startup/ coyote/http2/ tomcat/util/descriptor/web/ tomcat/websocket/
Posted by Rémy Maucherat <re...@apache.org>.
On Wed, Jul 26, 2017 at 4:37 PM, <re...@apache.org> wrote:
> Author: remm
> Date: Wed Jul 26 14:37:20 2017
> New Revision: 1803055
>
> URL: http://svn.apache.org/viewvc?rev=1803055&view=rev
> Log:
> Fix bit sign checks warnings, no functional change.
>
> To which branches should non functional cleanups like this be backported
now ?
8.5: yes
8.0: no because of planned EOL ?
7.0: yes ?
6.0: no
Rémy