You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by tr...@apache.org on 2005/08/12 09:41:24 UTC
svn commit: r232224 -
/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextPartitionNexusProxy.java
Author: trustin
Date: Fri Aug 12 00:41:20 2005
New Revision: 232224
URL: http://svn.apache.org/viewcvs?rev=232224&view=rev
Log:
DIREVE-180
Made ContextPartitionNexus to throw a ServiceUnavailableException when user tries to operate on the service which is not started yet.
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextPartitionNexusProxy.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextPartitionNexusProxy.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextPartitionNexusProxy.java?rev=232224&r1=232223&r2=232224&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextPartitionNexusProxy.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextPartitionNexusProxy.java Fri Aug 12 00:41:20 2005
@@ -23,6 +23,7 @@
import javax.naming.Name;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
+import javax.naming.ServiceUnavailableException;
import javax.naming.directory.Attributes;
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
@@ -100,6 +101,7 @@
}
public Name getMatchedName(Name dn, boolean normalized) throws NamingException {
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation(
caller, "getMatchedDn",
@@ -115,6 +117,7 @@
}
public Name getSuffix(Name dn, boolean normalized) throws NamingException {
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation(
caller, "getSuffix",
@@ -130,6 +133,7 @@
}
public Iterator listSuffixes(boolean normalized) throws NamingException {
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation(
caller, "listSuffixes",
@@ -145,6 +149,7 @@
}
public void delete(Name name) throws NamingException {
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation(
caller, "delete",
@@ -160,6 +165,7 @@
}
public void add(String upName, Name normName, Attributes entry) throws NamingException {
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation(
caller, "add",
@@ -175,6 +181,7 @@
}
public void modify(Name name, int modOp, Attributes mods) throws NamingException {
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
// TODO Use predefined modOp Interger constants.
stack.push( new Invocation(
@@ -191,6 +198,7 @@
}
public void modify(Name name, ModificationItem[] mods) throws NamingException {
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation(
caller, "modify",
@@ -206,6 +214,7 @@
}
public NamingEnumeration list(Name base) throws NamingException {
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation(
caller, "list",
@@ -221,6 +230,7 @@
}
public NamingEnumeration search(Name base, Map env, ExprNode filter, SearchControls searchCtls) throws NamingException {
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation(
caller, "search",
@@ -236,6 +246,7 @@
}
public Attributes lookup(Name name) throws NamingException {
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation(
caller, "lookup",
@@ -251,6 +262,7 @@
}
public Attributes lookup(Name dn, String[] attrIds) throws NamingException {
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation(
caller, "lookup",
@@ -266,6 +278,7 @@
}
public boolean hasEntry(Name name) throws NamingException {
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation(
caller, "hasEntry",
@@ -281,6 +294,7 @@
}
public boolean isSuffix(Name name) throws NamingException {
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation(
caller, "isSuffix",
@@ -296,6 +310,7 @@
}
public void modifyRn(Name name, String newRn, boolean deleteOldRn) throws NamingException {
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation(
caller, "modifyRn",
@@ -311,6 +326,7 @@
}
public void move(Name oriChildName, Name newParentName) throws NamingException {
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation(
caller, "move",
@@ -326,6 +342,7 @@
}
public void move(Name oriChildName, Name newParentName, String newRn, boolean deleteOldRn) throws NamingException {
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation(
caller, "move",
@@ -342,6 +359,7 @@
public Attributes getRootDSE() throws NamingException
{
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation( caller, "getRootDSE" ) );
try
@@ -356,6 +374,7 @@
public void addContextPartition( ContextPartitionConfiguration config ) throws NamingException
{
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation(
caller, "addContextPartition",
@@ -372,6 +391,7 @@
public void removeContextPartition( Name suffix ) throws NamingException
{
+ ensureStarted();
InvocationStack stack = InvocationStack.getInstance();
stack.push( new Invocation(
caller, "removeContextPartition",
@@ -384,5 +404,12 @@
{
stack.pop();
}
- }
+ }
+
+ private void ensureStarted() throws ServiceUnavailableException {
+ if( !service.isStarted() )
+ {
+ throw new ServiceUnavailableException( "ContextFactoryService is not started." );
+ }
+ }
}