You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@onami.apache.org by ra...@apache.org on 2013/03/02 16:35:10 UTC
svn commit: r1451898 -
/incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingletonScopeImpl.java
Author: randgalt
Date: Sat Mar 2 15:35:09 2013
New Revision: 1451898
URL: http://svn.apache.org/r1451898
Log:
Fixed merge issues
Modified:
incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingletonScopeImpl.java
Modified: incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingletonScopeImpl.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingletonScopeImpl.java?rev=1451898&r1=1451897&r2=1451898&view=diff
==============================================================================
--- incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingletonScopeImpl.java (original)
+++ incubator/onami/trunk/scopes/src/main/java/org/apache/onami/scopes/ConcurrentLazySingletonScopeImpl.java Sat Mar 2 15:35:09 2013
@@ -31,7 +31,6 @@ import java.util.Map;
class ConcurrentLazySingletonScopeImpl
implements Scope
{
-
private static final Object NULL = new Object();
private final Map<Key<?>, LockRecord> locks = new HashMap<Key<?>, LockRecord>();
@@ -86,13 +85,8 @@ class ConcurrentLazySingletonScopeImpl
Object localInstance = instance;
// This is safe because instance has type T or is equal to NULL
-<<<<<<< HEAD
- @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" })
- T returnedInstance = ( localInstance != NULL ) ? (T) localInstance : null;
-=======
@SuppressWarnings( { "unchecked", "UnnecessaryLocalVariable" } ) T returnedInstance =
( localInstance != NULL ) ? (T) localInstance : null;
->>>>>>> ONAMI-93 - locks field doesn't need to be static
return returnedInstance;
}
@@ -136,11 +130,8 @@ class ConcurrentLazySingletonScopeImpl
return "ConcurrentLazySingletonScope.SCOPE";
}
-<<<<<<< HEAD
-=======
private static class LockRecord
{
private int useCount = 0;
}
->>>>>>> ONAMI-93 - locks field doesn't need to be static
}