aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Curtis2014-07-01 16:56:02 (EDT)
committertware2014-07-29 15:11:31 (EDT)
commitc3bfddc540d6e4e22424e1cbb991533342c4a8f7 (patch)
tree49947c18c65a6371657931df7f2249e6b4733aa4
parenta69e2e50593d691682881a4efff67bb0f610a6ea (diff)
downloadeclipselink.runtime-c3bfddc540d6e4e22424e1cbb991533342c4a8f7.zip
eclipselink.runtime-c3bfddc540d6e4e22424e1cbb991533342c4a8f7.tar.gz
eclipselink.runtime-c3bfddc540d6e4e22424e1cbb991533342c4a8f7.tar.bz2
438663 - Fix PostConstruct injection ordering bug.
Signed-off-by: Rick Curtis <curtisr7@gmail.com>
-rw-r--r--foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/sessions/cdi/EntityListenerInjectionManagerImpl.java6
1 files changed, 4 insertions, 2 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..99b274f 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,8 @@
*
* Contributors:
* tware - initial implemenation
+ * 07/01/2014-2.5.2 Rick Curtis
+ * - 438663: Fix injection ordering bug.
******************************************************************************/
package org.eclipse.persistence.internal.sessions.cdi;
@@ -58,9 +60,9 @@ public class EntityListenerInjectionManagerImpl implements EntityListenerInjecti
synchronized (injectionTargets) {
injectionTargets.put(entityListener, injectionTarget);
}
- injectionTarget.postConstruct(entityListener);
creationalContext = beanManager.<Object>createCreationalContext(null);
injectionTarget.inject(entityListener, creationalContext);
+ injectionTarget.postConstruct(entityListener);
return entityListener;
}