From: <ms...@us...> - 2010-11-18 13:53:28
|
Revision: 11724 http://wonder.svn.sourceforge.net/wonder/?rev=11724&view=rev Author: mschrag Date: 2010-11-18 13:53:22 +0000 (Thu, 18 Nov 2010) Log Message: ----------- findbugs fixes Modified Paths: -------------- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinator.java branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinatorSynchronizer.java branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/remoteSynchronizer/ERXRemoteSynchronizer.java branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/remoteSynchronizer/ERXSimpleMulticastSynchronizer.java Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinator.java =================================================================== --- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinator.java 2010-11-18 13:48:20 UTC (rev 11723) +++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinator.java 2010-11-18 13:53:22 UTC (rev 11724) @@ -20,7 +20,7 @@ */ public class ERXObjectStoreCoordinator extends EOObjectStoreCoordinator { - public static Logger log = Logger.getLogger(ERXObjectStoreCoordinator.class); + public static final Logger log = Logger.getLogger(ERXObjectStoreCoordinator.class); NSMutableDictionary/*<Thread, NSMutableArray<Exception>>*/ openLockTraces; Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinatorSynchronizer.java =================================================================== --- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinatorSynchronizer.java 2010-11-18 13:48:20 UTC (rev 11723) +++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinatorSynchronizer.java 2010-11-18 13:53:22 UTC (rev 11724) @@ -45,7 +45,7 @@ * manually. */ public class ERXObjectStoreCoordinatorSynchronizer { - public static Logger log = Logger.getLogger(ERXObjectStoreCoordinatorSynchronizer.class); + public static final Logger log = Logger.getLogger(ERXObjectStoreCoordinatorSynchronizer.class); public static final String SYNCHRONIZER_KEY = "_synchronizer"; Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/remoteSynchronizer/ERXRemoteSynchronizer.java =================================================================== --- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/remoteSynchronizer/ERXRemoteSynchronizer.java 2010-11-18 13:48:20 UTC (rev 11723) +++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/remoteSynchronizer/ERXRemoteSynchronizer.java 2010-11-18 13:53:22 UTC (rev 11724) @@ -34,7 +34,7 @@ * @author mschrag */ public abstract class ERXRemoteSynchronizer { - public static Logger log = Logger.getLogger(ERXRemoteSynchronizer.class); + public static final Logger log = Logger.getLogger(ERXRemoteSynchronizer.class); public static boolean remoteSynchronizerEnabled() { return ERXProperties.booleanForKeyWithDefault("er.extensions.remoteSynchronizer.enabled", false); Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/remoteSynchronizer/ERXSimpleMulticastSynchronizer.java =================================================================== --- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/remoteSynchronizer/ERXSimpleMulticastSynchronizer.java 2010-11-18 13:48:20 UTC (rev 11723) +++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/remoteSynchronizer/ERXSimpleMulticastSynchronizer.java 2010-11-18 13:53:22 UTC (rev 11724) @@ -174,10 +174,11 @@ int transactionID = dis.readInt(); short transactionNum = dis.readShort(); short transactionSize = dis.readShort(); - String transactionIdentifierStr = identifier + "-" + transactionID; + String identifierHex = ERXStringUtilities.byteArrayToHexString(identifier); + String transactionIdentifierStr = identifierHex + "-" + transactionID; RemoteChange remoteChange = (RemoteChange) _incomingCacheChanges.objectForKey(transactionIdentifierStr); if (remoteChange == null) { - remoteChange = new RemoteChange(ERXStringUtilities.byteArrayToHexString(identifier), transactionID, transactionSize); + remoteChange = new RemoteChange(identifierHex, transactionID, transactionSize); _incomingCacheChanges.setObjectForKey(remoteChange, transactionIdentifierStr); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |