From b30f406570114a5a7de645fd46fc7b4bc619fb09 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 20 Oct 2014 12:11:48 +0000
Subject: [PATCH] Autorefactored simplifying expressions: - removed useless parentheses - added parentheses to disambiguate expressions - removed useless use of "this" keyword in method calls - removed useless null checks in conjunction with use of instanceof operator

---
 opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java
index c7a250b..4d025ea 100644
--- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java
+++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java
@@ -273,7 +273,7 @@
         // Read the header if haven't done so already
         peekLength();
 
-        if ((peekLength < 1) || (peekLength > 4)) {
+        if (peekLength < 1 || peekLength > 4) {
             final LocalizableMessage message = ERR_ASN1_INTEGER_INVALID_LENGTH.get(peekLength);
             throw DecodeException.fatalError(message);
         }
@@ -288,7 +288,7 @@
         // Read the header if haven't done so already
         peekLength();
 
-        if ((peekLength < 1) || (peekLength > 8)) {
+        if (peekLength < 1 || peekLength > 8) {
             final LocalizableMessage message = ERR_ASN1_INTEGER_INVALID_LENGTH.get(peekLength);
             throw DecodeException.fatalError(message);
         }
@@ -298,7 +298,7 @@
             long longValue = 0;
             for (int i = 0; i < peekLength; i++) {
                 final int readByte = buffer.get();
-                if ((i == 0) && (((byte) readByte) < 0)) {
+                if (i == 0 && ((byte) readByte) < 0) {
                     longValue = 0xFFFFFFFFFFFFFFFFL;
                 }
                 longValue = (longValue << 8) | (readByte & 0xFF);
@@ -310,7 +310,7 @@
             int intValue = 0;
             for (int i = 0; i < peekLength; i++) {
                 final int readByte = buffer.get();
-                if ((i == 0) && (((byte) readByte) < 0)) {
+                if (i == 0 && ((byte) readByte) < 0) {
                     intValue = 0xFFFFFFFF;
                 }
                 intValue = (intValue << 8) | (readByte & 0xFF);
@@ -492,7 +492,7 @@
 
         // Make sure that the element is not larger than the maximum allowed
         // message size.
-        if ((maxElementSize > 0) && (peekLength > maxElementSize)) {
+        if (maxElementSize > 0 && peekLength > maxElementSize) {
             final LocalizableMessage m =
                     ERR_LDAP_CLIENT_DECODE_MAX_REQUEST_SIZE_EXCEEDED
                             .get(peekLength, maxElementSize);
@@ -544,7 +544,7 @@
 
         // Make sure that the element is not larger than the maximum allowed
         // message size.
-        if ((maxElementSize > 0) && (peekLength > maxElementSize)) {
+        if (maxElementSize > 0 && peekLength > maxElementSize) {
             final LocalizableMessage m =
                     ERR_LDAP_CLIENT_DECODE_MAX_REQUEST_SIZE_EXCEEDED
                             .get(peekLength, maxElementSize);
@@ -566,7 +566,7 @@
      */
     private boolean needTypeState(final boolean ensureRead) throws IOException {
         // Read just the type.
-        if (ensureRead && (readLimiter.remaining() <= 0)) {
+        if (ensureRead && readLimiter.remaining() <= 0) {
             return false;
         }
 

--
Gitblit v1.10.0