You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2011/01/23 23:32:01 UTC
svn commit: r1062554 - in /directory/shared/trunk:
asn1-ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/
dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/
dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ dsml...
Author: elecharny
Date: Sun Jan 23 22:32:01 2011
New Revision: 1062554
URL: http://svn.apache.org/viewvc?rev=1062554&view=rev
Log:
Fixed some warnings
Removed:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/
Modified:
directory/shared/trunk/asn1-ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLVStateEnum.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BatchRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionType.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/BindStatus.java
directory/shared/trunk/util/src/main/java/org/apache/directory/shared/util/GeneralizedTime.java
Modified: directory/shared/trunk/asn1-ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLVStateEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1-ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLVStateEnum.java?rev=1062554&r1=1062553&r2=1062554&view=diff
==============================================================================
--- directory/shared/trunk/asn1-ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLVStateEnum.java (original)
+++ directory/shared/trunk/asn1-ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLVStateEnum.java Sun Jan 23 22:32:01 2011
@@ -68,5 +68,5 @@ public enum TLVStateEnum
PDU_DECODED,
/** The ending state */
- GRAMMAR_END;
+ GRAMMAR_END
}
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java?rev=1062554&r1=1062553&r2=1062554&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java Sun Jan 23 22:32:01 2011
@@ -492,5 +492,5 @@ public enum Dsmlv2StatesEnum
SEARCH_RESULT_REFERENCE_LOOP,
/** The Search Result Done End state */
- SEARCH_RESULT_DONE_END;
+ SEARCH_RESULT_DONE_END
}
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java?rev=1062554&r1=1062553&r2=1062554&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java Sun Jan 23 22:32:01 2011
@@ -22,8 +22,8 @@ package org.apache.directory.shared.dsml
import org.apache.directory.shared.dsmlv2.DsmlDecorator;
-import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
import org.apache.directory.shared.ldap.message.AbstractResponse;
+import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
import org.apache.directory.shared.ldap.model.message.Response;
import org.dom4j.Element;
@@ -70,7 +70,7 @@ public class ErrorResponse extends Abstr
UNRESOLVABLE_URI,
/** Other error response type. */
OTHER
- };
+ }
/** The type of error response */
private ErrorResponseType errorType;
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BatchRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BatchRequest.java?rev=1062554&r1=1062553&r2=1062554&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BatchRequest.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BatchRequest.java Sun Jan 23 22:32:01 2011
@@ -55,7 +55,7 @@ public class BatchRequest
SEQUENTIAL,
/** Parallel processing. */
PARALLEL
- };
+ }
/**
* The type of processing of the Batch Request
@@ -73,7 +73,7 @@ public class BatchRequest
RESUME,
/** Exit on error. */
EXIT
- };
+ }
/**
* The type of on error handling
@@ -91,7 +91,7 @@ public class BatchRequest
SEQUENTIAL,
/** Unordered response order. */
UNORDERED
- };
+ }
/**
* The response order
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionType.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionType.java?rev=1062554&r1=1062553&r2=1062554&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionType.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionType.java Sun Jan 23 22:32:01 2011
@@ -63,5 +63,5 @@ public enum AssertionType
NOT,
/** Undefined operation */
- UNDEFINED;
+ UNDEFINED
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java?rev=1062554&r1=1062553&r2=1062554&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java Sun Jan 23 22:32:01 2011
@@ -43,19 +43,19 @@ import java.util.NoSuchElementException;
import org.apache.directory.shared.asn1.util.OID;
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.model.message.Control;
-import org.apache.directory.shared.ldap.name.Rdn;
-import org.apache.directory.shared.util.exception.NotImplementedException;
import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.model.exception.LdapException;
+import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.model.message.Control;
import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.name.DnParser;
+import org.apache.directory.shared.ldap.name.Rdn;
import org.apache.directory.shared.util.Base64;
import org.apache.directory.shared.util.Chars;
import org.apache.directory.shared.util.Strings;
+import org.apache.directory.shared.util.exception.NotImplementedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -666,7 +666,10 @@ public class LdifReader implements Itera
{
try
{
- inf.close();
+ if ( inf != null )
+ {
+ inf.close();
+ }
}
catch ( IOException ioe )
{
@@ -1674,16 +1677,12 @@ public class LdifReader implements Itera
// Close the reader
try
{
- if ( reader != null )
- {
- reader.close();
- }
+ reader.close();
}
catch ( IOException ioe )
{
throw new LdapLdifException( I18n.err( I18n.ERR_12024_CANNOT_CLOSE_FILE ) );
}
-
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/BindStatus.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/BindStatus.java?rev=1062554&r1=1062553&r2=1062554&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/BindStatus.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/BindStatus.java Sun Jan 23 22:32:01 2011
@@ -46,5 +46,5 @@ public enum BindStatus
/**
* The user has been authenticated
*/
- AUTHENTICATED;
+ AUTHENTICATED
}
Modified: directory/shared/trunk/util/src/main/java/org/apache/directory/shared/util/GeneralizedTime.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/main/java/org/apache/directory/shared/util/GeneralizedTime.java?rev=1062554&r1=1062553&r2=1062554&view=diff
==============================================================================
--- directory/shared/trunk/util/src/main/java/org/apache/directory/shared/util/GeneralizedTime.java (original)
+++ directory/shared/trunk/util/src/main/java/org/apache/directory/shared/util/GeneralizedTime.java Sun Jan 23 22:32:01 2011
@@ -129,7 +129,7 @@ public class GeneralizedTime implements
/** Time format, minutes and seconds are omitted, excluding fraction. */
YEAR_MONTH_DAY_HOUR,
/** Time format, minutes and seconds are omitted, including fraction. */
- YEAR_MONTH_DAY_HOUR_FRACTION, ;
+ YEAR_MONTH_DAY_HOUR_FRACTION
}
/**
@@ -153,7 +153,7 @@ public class GeneralizedTime implements
/** g-differential format, using hour only. */
DIFF_HOUR,
/** g-differential format, using hour and minute. */
- DIFF_HOUR_MINUTE;
+ DIFF_HOUR_MINUTE
}
private static final TimeZone GMT = TimeZone.getTimeZone( "GMT" );