findbugs BOB/SAM. more to do.

This commit is contained in:
dg2-new
2013-11-20 12:02:44 +00:00
parent 413ad6b0e6
commit 28b6675979
6 changed files with 31 additions and 29 deletions

View File

@@ -305,8 +305,8 @@ public class SAMStreamSession {
}
synchronized (handlersMapLock) {
handlersMap.put(new Integer(id), reader);
sendersMap.put(new Integer(id), sender);
handlersMap.put(Integer.valueOf(id), reader);
sendersMap.put(Integer.valueOf(id), sender);
}
I2PAppThread t = new I2PAppThread(reader, "SAMReader" + id);
@@ -332,12 +332,12 @@ public class SAMStreamSession {
*/
protected SAMStreamSessionSocketReader getSocketReader ( int id ) {
synchronized (handlersMapLock) {
return handlersMap.get(new Integer(id));
return handlersMap.get(Integer.valueOf(id));
}
}
private StreamSender getSender(int id) {
synchronized (handlersMapLock) {
return sendersMap.get(new Integer(id));
return sendersMap.get(Integer.valueOf(id));
}
}
@@ -349,7 +349,7 @@ public class SAMStreamSession {
*/
protected boolean checkSocketHandlerId ( int id ) {
synchronized (handlersMapLock) {
return (!(handlersMap.get(new Integer(id)) == null));
return (!(handlersMap.get(Integer.valueOf(id)) == null));
}
}
@@ -363,8 +363,8 @@ public class SAMStreamSession {
StreamSender sender = null;
synchronized (handlersMapLock) {
reader = handlersMap.remove(new Integer(id));
sender = sendersMap.remove(new Integer(id));
reader = handlersMap.remove(Integer.valueOf(id));
sender = sendersMap.remove(Integer.valueOf(id));
}
if (reader != null)

View File

@@ -189,6 +189,7 @@ public class SAMUtils {
/* Dump a Properties object in an human-readable form */
private static String dumpProperties(Properties props) {
Enumeration names = props.propertyNames();
StringBuilder builder = new StringBuilder();
String msg = "";
String key, val;
boolean firstIter = true;
@@ -202,10 +203,10 @@ public class SAMUtils {
} else {
firstIter = false;
}
msg += " \"" + key + "\" -> \"" + val + "\"";
builder.append(" \"" + key + "\" -> \"" + val + "\"");
}
return msg;
return builder.toString();
}
/****

View File

@@ -218,7 +218,7 @@ public class SAMv3Handler extends SAMv1Handler
public SessionRecord( String dest, Properties props, SAMv3Handler handler )
{
m_dest = new String(dest) ;
m_dest = dest;
m_props = new Properties() ;
m_props.putAll(props);
m_threadgroup = null ;
@@ -235,7 +235,7 @@ public class SAMv3Handler extends SAMv1Handler
synchronized public String getDest()
{
return new String(m_dest) ;
return m_dest;
}
synchronized public Properties getProps()
{