You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2011/09/30 20:59:20 UTC
svn commit: r1177777 - in /directory/apacheds/trunk:
core-annotations/src/main/java/org/apache/directory/server/core/factory/
i18n/src/main/java/org/apache/directory/server/i18n/
i18n/src/main/resources/org/apache/directory/server/i18n/
Author: felixk
Date: Fri Sep 30 18:59:19 2011
New Revision: 1177777
URL: http://svn.apache.org/viewvc?rev=1177777&view=rev
Log:
Avoid NPE
Modified:
directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java?rev=1177777&r1=1177776&r2=1177777&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java Fri Sep 30 18:59:19 2011
@@ -248,10 +248,12 @@ public class DSAnnotationProcessor
if ( instance != null )
{
dsBuilder = (CreateDS)instance;
- }
- // Ok, we have found a CreateDS annotation. Process it now.
- return createDS( dsBuilder );
+ // Ok, we have found a CreateDS annotation. Process it now.
+ return createDS( dsBuilder );
+ }
+
+ throw new LdapException( I18n.err( I18n.ERR_114 ) );
}
Modified: directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java?rev=1177777&r1=1177776&r2=1177777&view=diff
==============================================================================
--- directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java (original)
+++ directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java Fri Sep 30 18:59:19 2011
@@ -147,7 +147,7 @@ public enum I18n
// ERR_111( "ERR_111" ),
// ERR_112( "ERR_112" ),
// ERR_113( "ERR_113" ),
- // ERR_114( "ERR_ 114" ),
+ ERR_114("ERR_114"),
ERR_115("ERR_115"),
ERR_116("ERR_116"),
ERR_117("ERR_117"),
Modified: directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties?rev=1177777&r1=1177776&r2=1177777&view=diff
==============================================================================
--- directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties (original)
+++ directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties Fri Sep 30 18:59:19 2011
@@ -135,7 +135,7 @@ ERR_91=Attempt to destroy wrapped partit
# ERR_111=
# ERR_112=
# ERR_113=
-# ERR_114=
+ERR_114=Unable to create a DirectoryService instance for unknow reason
ERR_115=Failed to delete the working directory.
ERR_116=Failed to delete\:
ERR_117=Unsupported changetype found in LDIF: {0}