Author: mprudhom
Date: Fri Nov 17 12:34:28 2006
New Revision: 476305
URL: http://svn.apache.org/viewvc?view=rev&rev=476305
Log:
Null check.
Modified:
incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactoryImpl.java
Modified:
incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactoryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactoryImpl.java?view=diff&rev=476305&r1=476304&r2=476305
==============================================================================
---
incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactoryImpl.java
(original)
+++
incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactoryImpl.java
Fri Nov 17 12:34:28 2006
@@ -154,7 +154,7 @@
// this initialization has to happen lazily because there is no
// guarantee that conf.getId() will be populated by the time that
// endConfiguration() is called.
- if (_diagContext == null) {
+ if (_diagContext == null && _conf != null) {
_diagContext = _conf.getId();
}
if ("".equals(_diagContext))
