aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Curtis2014-06-24 17:17:10 (EDT)
committertware2014-07-04 09:47:48 (EDT)
commita8ba336bc4d9d3f38ca09abb0f0286ba445e7fb0 (patch)
tree2bc45c348871cb4e206d549c7361c5f11bf70cd4
parentf7cdcba0bbdc84297596eac55731d03997b4c631 (diff)
downloadeclipselink.runtime-a8ba336bc4d9d3f38ca09abb0f0286ba445e7fb0.zip
eclipselink.runtime-a8ba336bc4d9d3f38ca09abb0f0286ba445e7fb0.tar.gz
eclipselink.runtime-a8ba336bc4d9d3f38ca09abb0f0286ba445e7fb0.tar.bz2
Fix for bug 438105. Update logic in EntityListenerInjectionManagerImpl constructor.
Signed-off-by: Rick Curtis <curtisr7@gmail.com>
-rw-r--r--foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/sessions/cdi/EntityListenerInjectionManagerImpl.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/sessions/cdi/EntityListenerInjectionManagerImpl.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/sessions/cdi/EntityListenerInjectionManagerImpl.java
index 2cb5e8d..0da3a19 100644
--- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/sessions/cdi/EntityListenerInjectionManagerImpl.java
+++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/sessions/cdi/EntityListenerInjectionManagerImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014 Oracle and/or its affiliates, IBM Corporation. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
* which accompanies this distribution.
@@ -9,6 +9,7 @@
*
* Contributors:
* tware - initial implemenation
+ * 06/24/2014 - 438105 - 2.6.0 - Rick Curtis - Fix bug in EntityListenerInjectionManagerImpl constructor.
******************************************************************************/
package org.eclipse.persistence.internal.sessions.cdi;
@@ -40,14 +41,13 @@ public class EntityListenerInjectionManagerImpl implements EntityListenerInjecti
protected Map<Object, InjectionTarget<Object>> injectionTargets = null;
- public EntityListenerInjectionManagerImpl(Object beanManager) throws NamingException{
- if (beanManager != null){
- this.beanManager = (BeanManager) beanManager;
- }else{
+ public EntityListenerInjectionManagerImpl(Object beanManagerInstance) throws NamingException {
+ if (beanManagerInstance == null) {
Context context = new InitialContext();
-
- beanManager = (BeanManager) context.lookup("java:comp/BeanManager");
+ beanManagerInstance = context.lookup("java:comp/BeanManager");
}
+ beanManager = (BeanManager) beanManagerInstance;
+
injectionTargets = new HashMap<Object, InjectionTarget<Object>>();
}