Update of /var/cvs/src/org/mmbase/security
In directory james.mmbase.org:/tmp/cvs-serv15526
Modified Files:
ActionRepository.java
Log Message:
avoid NPE if shutdown twice
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/security
Index: ActionRepository.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/security/ActionRepository.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ActionRepository.java 16 Sep 2008 16:36:59 -0000 1.9
+++ ActionRepository.java 1 Oct 2008 16:57:21 -0000 1.10
@@ -18,7 +18,7 @@
*
* @see Action
* @author Michiel Meeuwissen
- * @version $Id: ActionRepository.java,v 1.9 2008/09/16 16:36:59 michiel Exp $
+ * @version $Id: ActionRepository.java,v 1.10 2008/10/01 16:57:21 michiel Exp $
* @since MMBase-1.9
*/
public abstract class ActionRepository extends Configurable {
@@ -29,7 +29,12 @@
if (bootstrap != null) {
return bootstrap;
} else {
- return
org.mmbase.module.core.MMBase.getMMBase().getMMBaseCop().getActionRepository();
+ MMBaseCop mmbc =
org.mmbase.module.core.MMBase.getMMBase().getMMBaseCop();
+ if (mmbc != null) {
+ return mmbc.getActionRepository();
+ } else {
+ return new MemoryActionRepository();
+ }
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
