pnever 2003/10/07 01:36:31
Modified: src/share/org/apache/slide/common AbstractServiceBase.java
Log:
Avoiding NPE in getLogger() - thanks to Oliver Zeigermann!
Revision Changes Path
1.9 +13 -8
jakarta-slide/src/share/org/apache/slide/common/AbstractServiceBase.java
Index: AbstractServiceBase.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/AbstractServiceBase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractServiceBase.java 25 Apr 2002 21:12:27 -0000 1.8
+++ AbstractServiceBase.java 7 Oct 2003 08:36:31 -0000 1.9
@@ -82,7 +82,7 @@
protected String LOG_CHANNEL = this.getClass().getName();
-
+
// ----------------------------------------------------- Instance Variables
@@ -97,9 +97,9 @@
// -------------------------------------------------------- Service Methods
-
-
+
+
/**
* Set the scope of the store as specified in domain.xml.
*/
@@ -121,11 +121,16 @@
* Logger accessor.
*/
public Logger getLogger() {
- Logger logger = this.namespace.getLogger();
+ Logger logger = null;
+ if (namespace != null) {
+ logger = this.namespace.getLogger();
+ }
if (logger == null)
logger = Domain.getLogger();
return logger;
}
+
+
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
