You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2012/12/07 17:06:59 UTC
svn commit: r1418371 - in /mina/mina/branches/2.0:
mina-core/src/main/java/org/apache/mina/core/polling/
mina-core/src/main/java/org/apache/mina/proxy/handlers/socks/
mina-core/src/main/java/org/apache/mina/util/
mina-example/src/main/java/org/apache/m...
Author: elecharny
Date: Fri Dec 7 16:06:55 2012
New Revision: 1418371
URL: http://svn.apache.org/viewvc?rev=1418371&view=rev
Log:
Fixed various Sonar issues (performance, SimpleDateFormat without synchronization, etc)
Modified:
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/socks/Socks5LogicHandler.java
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/util/AvailablePortFinder.java
mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java
mina/mina/branches/2.0/mina-http/src/main/java/org/apache/mina/http/DateUtil.java
mina/mina/branches/2.0/mina-statemachine/src/main/java/org/apache/mina/statemachine/StateMachineProxyBuilder.java
Modified: mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java?rev=1418371&r1=1418370&r2=1418371&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java (original)
+++ mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java Fri Dec 7 16:06:55 2012
@@ -736,23 +736,6 @@ public abstract class AbstractPollingIoP
}
}
- private static String byteArrayToHex(byte[] barray) {
- char[] c = new char[barray.length * 2];
- int pos = 0;
-
- for (byte b : barray) {
- int bb = (b & 0x00FF) >> 4;
- c[pos++] = (char) (bb > 9 ? bb + 0x37 : bb + 0x30);
- bb = b & 0x0F;
- c[pos++] = (char) (bb > 9 ? bb + 0x37 : bb + 0x30);
- if (pos > 60) {
- break;
- }
- }
-
- return new String(c);
- }
-
private void notifyIdleSessions(long currentTime) throws Exception {
// process idle sessions
if (currentTime - lastIdleCheckTime >= SELECT_TIMEOUT) {
Modified: mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/socks/Socks5LogicHandler.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/socks/Socks5LogicHandler.java?rev=1418371&r1=1418370&r2=1418371&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/socks/Socks5LogicHandler.java (original)
+++ mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/socks/Socks5LogicHandler.java Fri Dec 7 16:06:55 2012
@@ -342,7 +342,7 @@ public class Socks5LogicHandler extends
+ "the socks proxy server");
}
- getSession().setAttribute(SELECTED_AUTH_METHOD, new Byte(method));
+ getSession().setAttribute(SELECTED_AUTH_METHOD, Byte.valueOf(method));
} else if (step == SocksProxyConstants.SOCKS5_AUTH_STEP) {
// Authentication to the SOCKS server
Modified: mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/util/AvailablePortFinder.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/util/AvailablePortFinder.java?rev=1418371&r1=1418370&r2=1418371&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/util/AvailablePortFinder.java (original)
+++ mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/util/AvailablePortFinder.java Fri Dec 7 16:06:55 2012
@@ -161,7 +161,7 @@ public class AvailablePortFinder {
try {
s = new ServerSocket(i);
- result.add(new Integer(i));
+ result.add(Integer.valueOf(i));
} catch (IOException e) {
// Do nothing
} finally {
Modified: mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java?rev=1418371&r1=1418370&r2=1418371&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java (original)
+++ mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java Fri Dec 7 16:06:55 2012
@@ -45,7 +45,7 @@ public class ServerSessionHandler extend
session.getConfig().setIdleTime(IdleStatus.BOTH_IDLE, 60);
// initial sum is zero
- session.setAttribute(SUM_KEY, new Integer(0));
+ session.setAttribute(SUM_KEY, Integer.valueOf(0));
}
@Override
@@ -67,7 +67,7 @@ public class ServerSessionHandler extend
} else {
// sum up
sum = (int) expectedSum;
- session.setAttribute(SUM_KEY, new Integer(sum));
+ session.setAttribute(SUM_KEY, Integer.valueOf(sum));
// return the result message
ResultMessage rm = new ResultMessage();
Modified: mina/mina/branches/2.0/mina-http/src/main/java/org/apache/mina/http/DateUtil.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-http/src/main/java/org/apache/mina/http/DateUtil.java?rev=1418371&r1=1418370&r2=1418371&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-http/src/main/java/org/apache/mina/http/DateUtil.java (original)
+++ mina/mina/branches/2.0/mina-http/src/main/java/org/apache/mina/http/DateUtil.java Fri Dec 7 16:06:55 2012
@@ -45,7 +45,9 @@ public class DateUtil {
}
public static String getCurrentAsString() {
- return DateUtil.RFC_1123_FORMAT.format(new Date()); //NOPMD
+ synchronized(DateUtil.RFC_1123_FORMAT) {
+ return DateUtil.RFC_1123_FORMAT.format(new Date()); //NOPMD
+ }
}
/**
@@ -60,7 +62,9 @@ public class DateUtil {
private static long parseDateStringToMilliseconds(final String dateString) {
try {
- return DateUtil.RFC_1123_FORMAT.parse(dateString).getTime(); //NOPMD
+ synchronized (DateUtil.RFC_1123_FORMAT) {
+ return DateUtil.RFC_1123_FORMAT.parse(dateString).getTime(); //NOPMD
+ }
} catch (final ParseException e) {
return 0;
}
@@ -101,7 +105,9 @@ public class DateUtil {
final Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(dateValue);
- return DateUtil.RFC_1123_FORMAT.format(calendar.getTime()); //NOPMD
+ synchronized (DateUtil.RFC_1123_FORMAT) {
+ return DateUtil.RFC_1123_FORMAT.format(calendar.getTime()); //NOPMD
+ }
}
/**
@@ -112,7 +118,9 @@ public class DateUtil {
* @return a <code>String</code> representation of the date.
*/
public static String getDateAsString(Date date) {
- return RFC_1123_FORMAT.format(date); //NOPMD
+ synchronized (DateUtil.RFC_1123_FORMAT) {
+ return RFC_1123_FORMAT.format(date); //NOPMD
+ }
}
}
Modified: mina/mina/branches/2.0/mina-statemachine/src/main/java/org/apache/mina/statemachine/StateMachineProxyBuilder.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-statemachine/src/main/java/org/apache/mina/statemachine/StateMachineProxyBuilder.java?rev=1418371&r1=1418370&r2=1418371&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-statemachine/src/main/java/org/apache/mina/statemachine/StateMachineProxyBuilder.java (original)
+++ mina/mina/branches/2.0/mina-statemachine/src/main/java/org/apache/mina/statemachine/StateMachineProxyBuilder.java Fri Dec 7 16:06:55 2012
@@ -219,7 +219,7 @@ public class StateMachineProxyBuilder {
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
if ("hashCode".equals(method.getName()) && args == null) {
- return new Integer(System.identityHashCode(proxy));
+ return Integer.valueOf(System.identityHashCode(proxy));
}
if ("equals".equals(method.getName()) && args.length == 1) {
return Boolean.valueOf(proxy == args[0]);