You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by co...@apache.org on 2015/02/23 15:43:10 UTC
svn commit: r1661689 - in /directory/apacheds/trunk:
bulkloader/src/test/java/org/apache/directory/mavibot/btree/
core-api/src/test/java/org/apache/directory/server/core/api/entry/
core-avl/src/main/java/org/apache/directory/server/core/avltree/ core-a...
Author: coheigea
Date: Mon Feb 23 14:43:08 2015
New Revision: 1661689
URL: http://svn.apache.org/r1661689
Log:
Introducing some try-with-resources blocks to make sure that streams are getting closed
Modified:
directory/apacheds/trunk/bulkloader/src/test/java/org/apache/directory/mavibot/btree/MavibotPartitionBuilderTest.java
directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/entry/SchemaAwareModificationTest.java
directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java
directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/DefaultMarshaller.java
directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/MojoHelperUtils.java
directory/apacheds/trunk/interceptors/authn/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java
directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
directory/apacheds/trunk/interceptors/changelog/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DnSerializer.java
directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/IndexValueSerializer.java
directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ParentIdAndRdnSerializer.java
directory/apacheds/trunk/kerberos-client/src/main/java/org/apache/directory/kerberos/credentials/cache/CredentialsCache.java
directory/apacheds/trunk/kerberos-client/src/test/java/org/apache/directory/kerberos/client/CredentialsCacheTest.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java
directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTestUtils.java
directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotEntrySerializationTest.java
directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordDataEncoder.java
directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/AbstractDnsTestCase.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessageSerializer.java
directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java
Modified: directory/apacheds/trunk/bulkloader/src/test/java/org/apache/directory/mavibot/btree/MavibotPartitionBuilderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bulkloader/src/test/java/org/apache/directory/mavibot/btree/MavibotPartitionBuilderTest.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/bulkloader/src/test/java/org/apache/directory/mavibot/btree/MavibotPartitionBuilderTest.java (original)
+++ directory/apacheds/trunk/bulkloader/src/test/java/org/apache/directory/mavibot/btree/MavibotPartitionBuilderTest.java Mon Feb 23 14:43:08 2015
@@ -65,9 +65,10 @@ public class MavibotPartitionBuilderTest
//File file = new File( outDir, "builder-test.ldif" );
File file = new File( outDir, "30k.ldif" );
//InputStream in = MavibotPartitionBuilder.class.getClassLoader().getResourceAsStream( "builder-test.ldif" );
- InputStream in = MavibotPartitionBuilder.class.getClassLoader().getResourceAsStream( "30k.ldif" );
- FileUtils.copyInputStreamToFile( in, file );
- in.close();
+ try ( InputStream in = MavibotPartitionBuilder.class.getClassLoader().getResourceAsStream( "30k.ldif" ) )
+ {
+ FileUtils.copyInputStreamToFile( in, file );
+ }
MavibotPartitionBuilder builder = new MavibotPartitionBuilder( configFile, file.getAbsolutePath(), outDir.getAbsolutePath() );
Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/entry/SchemaAwareModificationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/entry/SchemaAwareModificationTest.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/entry/SchemaAwareModificationTest.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/entry/SchemaAwareModificationTest.java Mon Feb 23 14:43:08 2015
@@ -116,12 +116,10 @@ public class SchemaAwareModificationTest
private DefaultModification deserializeValue( ByteArrayOutputStream out ) throws IOException,
ClassNotFoundException, LdapException
{
- ObjectInputStream oIn = null;
- ByteArrayInputStream in = new ByteArrayInputStream( out.toByteArray() );
- try
+ try ( ByteArrayInputStream in = new ByteArrayInputStream( out.toByteArray() );
+ ObjectInputStream oIn = new ObjectInputStream( in ) )
{
- oIn = new ObjectInputStream( in );
DefaultModification value = new DefaultModification();
value.readExternal( oIn );
@@ -132,20 +130,6 @@ public class SchemaAwareModificationTest
{
throw ioe;
}
- finally
- {
- try
- {
- if ( oIn != null )
- {
- oIn.close();
- }
- }
- catch ( IOException ioe )
- {
- throw ioe;
- }
- }
}
Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java Mon Feb 23 14:43:08 2015
@@ -94,11 +94,10 @@ public class AvlTreeMarshaller<E> implem
x = x.next;
}
- ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
- DataOutputStream out = new DataOutputStream( byteStream );
byte[] data = null;
- try
+ try ( ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+ DataOutputStream out = new DataOutputStream( byteStream ) )
{
out.writeByte( 0 ); // represents the start of AvlTree byte stream
out.writeInt( tree.getSize() );
Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/DefaultMarshaller.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/DefaultMarshaller.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/DefaultMarshaller.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/DefaultMarshaller.java Mon Feb 23 14:43:08 2015
@@ -41,28 +41,25 @@ public class DefaultMarshaller implement
public byte[] serialize( Object object ) throws IOException
{
- ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
- ObjectOutputStream out = new ObjectOutputStream( byteStream );
- byte[] data;
-
- out.writeObject( object );
- out.flush();
- data = byteStream.toByteArray();
- out.close();
+ try ( ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream( byteStream ) )
+ {
+ out.writeObject( object );
+ out.flush();
+ byte[] data = byteStream.toByteArray();
+ out.close();
- return data;
+ return data;
+ }
}
public Object deserialize( byte[] bytes ) throws IOException
{
- Object object;
- ByteArrayInputStream byteStream = new ByteArrayInputStream( bytes );
- ObjectInputStream in = new ObjectInputStream( byteStream );
-
- try
+ try ( ByteArrayInputStream byteStream = new ByteArrayInputStream( bytes );
+ ObjectInputStream in = new ObjectInputStream( byteStream ) )
{
- object = in.readObject();
+ return in.readObject();
}
catch ( ClassNotFoundException e )
{
@@ -70,7 +67,5 @@ public class DefaultMarshaller implement
ioe.initCause( e );
throw ioe;
}
-
- return object;
}
}
Modified: directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java (original)
+++ directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java Mon Feb 23 14:43:08 2015
@@ -419,9 +419,10 @@ public class AvlTreeMarshallerTest
tree.insert( 8 );
tree.insert( 9 );
- FileOutputStream fout = new FileOutputStream( treeFile );
- fout.write( treeMarshaller.serialize( tree ) );
- fout.close();
+ try ( FileOutputStream fout = new FileOutputStream( treeFile ) )
+ {
+ fout.write( treeMarshaller.serialize( tree ) );
+ }
savedTree = tree; // to reference in other tests
@@ -434,12 +435,11 @@ public class AvlTreeMarshallerTest
assertTrue( true );
// UnMarshall
- FileInputStream fin = new FileInputStream( treeFile );
-
byte[] data = new byte[( int ) treeFile.length()];
- fin.read( data );
-
- fin.close();
+ try ( FileInputStream fin = new FileInputStream( treeFile ) )
+ {
+ fin.read( data );
+ }
AvlTree<Integer> unmarshalledTree = treeMarshaller.deserialize( data );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java Mon Feb 23 14:43:08 2015
@@ -190,12 +190,14 @@ public class MetaComparatorHandlerIT ext
@Test
public void testAddComparatorWithByteCodeToEnabledSchema() throws Exception
{
- InputStream in = getClass().getResourceAsStream( "DummyComparator.bytecode" );
ByteArrayOutputStream out = new ByteArrayOutputStream();
- while ( in.available() > 0 )
+ try ( InputStream in = getClass().getResourceAsStream( "DummyComparator.bytecode" ) )
{
- out.write( in.read() );
+ while ( in.available() > 0 )
+ {
+ out.write( in.read() );
+ }
}
Dn dn = new Dn( "m-oid=" + OID + ",ou=comparators,cn=apachemeta,ou=schema" );
@@ -229,12 +231,14 @@ public class MetaComparatorHandlerIT ext
@Test
public void testAddComparatorWithByteCodeToDisabledSchema() throws Exception
{
- InputStream in = getClass().getResourceAsStream( "DummyComparator.bytecode" );
ByteArrayOutputStream out = new ByteArrayOutputStream();
- while ( in.available() > 0 )
+ try ( InputStream in = getClass().getResourceAsStream( "DummyComparator.bytecode" ) )
{
- out.write( in.read() );
+ while ( in.available() > 0 )
+ {
+ out.write( in.read() );
+ }
}
Dn dn = new Dn( "m-oid=" + OID + ",ou=comparators,cn=nis,ou=schema" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java Mon Feb 23 14:43:08 2015
@@ -163,12 +163,14 @@ public class MetaNormalizerHandlerIT ext
@Test
public void testAddNormalizerWithByteCodeToEnabledSchema() throws Exception
{
- InputStream in = getClass().getResourceAsStream( "DummyNormalizer.bytecode" );
ByteArrayOutputStream out = new ByteArrayOutputStream();
- while ( in.available() > 0 )
+ try ( InputStream in = getClass().getResourceAsStream( "DummyNormalizer.bytecode" ) )
{
- out.write( in.read() );
+ while ( in.available() > 0 )
+ {
+ out.write( in.read() );
+ }
}
Dn dn = new Dn( "m-oid=" + OID + ",ou=normalizers,cn=apacheMeta,ou=schema" );
@@ -196,12 +198,14 @@ public class MetaNormalizerHandlerIT ext
@Test
public void testAddNormalizerWithByteCodeToDisabledSchema() throws Exception
{
- InputStream in = getClass().getResourceAsStream( "DummyNormalizer.bytecode" );
ByteArrayOutputStream out = new ByteArrayOutputStream();
- while ( in.available() > 0 )
+ try ( InputStream in = getClass().getResourceAsStream( "DummyNormalizer.bytecode" ) )
{
- out.write( in.read() );
+ while ( in.available() > 0 )
+ {
+ out.write( in.read() );
+ }
}
Dn dn = new Dn( "m-oid=" + OID + ",ou=normalizers,cn=nis,ou=schema" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java Mon Feb 23 14:43:08 2015
@@ -159,12 +159,14 @@ public class MetaSyntaxCheckerHandlerIT
@Test
public void testAddSyntaxCheckerWithByteCodeOnEnabledSchema() throws Exception
{
- InputStream in = getClass().getResourceAsStream( "DummySyntaxChecker.bytecode" );
ByteArrayOutputStream out = new ByteArrayOutputStream();
- while ( in.available() > 0 )
+ try ( InputStream in = getClass().getResourceAsStream( "DummySyntaxChecker.bytecode" ) )
{
- out.write( in.read() );
+ while ( in.available() > 0 )
+ {
+ out.write( in.read() );
+ }
}
Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" );
@@ -193,12 +195,14 @@ public class MetaSyntaxCheckerHandlerIT
@Test
public void testAddSyntaxCheckerWithByteCodeOnDisabledSchema() throws Exception
{
- InputStream in = getClass().getResourceAsStream( "DummySyntaxChecker.bytecode" );
ByteArrayOutputStream out = new ByteArrayOutputStream();
- while ( in.available() > 0 )
+ try ( InputStream in = getClass().getResourceAsStream( "DummySyntaxChecker.bytecode" ) )
{
- out.write( in.read() );
+ while ( in.available() > 0 )
+ {
+ out.write( in.read() );
+ }
}
Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=nis,ou=schema" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Mon Feb 23 14:43:08 2015
@@ -1992,15 +1992,17 @@ public class SubschemaSubentryIT extends
private String getByteCode( String resource ) throws IOException
{
- InputStream in = getClass().getResourceAsStream( resource );
- ByteArrayOutputStream out = new ByteArrayOutputStream();
-
- while ( in.available() > 0 )
+ try ( InputStream in = getClass().getResourceAsStream( resource );
+ ByteArrayOutputStream out = new ByteArrayOutputStream() )
{
- out.write( in.read() );
- }
- return new String( Base64.encode( out.toByteArray() ) );
+ while ( in.available() > 0 )
+ {
+ out.write( in.read() );
+ }
+
+ return new String( Base64.encode( out.toByteArray() ) );
+ }
}
Modified: directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java (original)
+++ directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java Mon Feb 23 14:43:08 2015
@@ -203,9 +203,10 @@ public class HttpServer
ks.setKeyEntry( "privatekey", keyPair.getPrivate(), password.toCharArray(), new Certificate[]
{ cert } );
- OutputStream stream = new FileOutputStream( ksFile );
- ks.store( stream, password.toCharArray() );
- stream.close();
+ try ( OutputStream stream = new FileOutputStream( ksFile ) )
+ {
+ ks.store( stream, password.toCharArray() );
+ }
SslSocketConnector httpsConnector = new SslSocketConnector();
httpsConnector.setPort( httpsTransport.getPort() );
Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/MojoHelperUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/MojoHelperUtils.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/MojoHelperUtils.java (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/MojoHelperUtils.java Mon Feb 23 14:43:08 2015
@@ -55,19 +55,15 @@ public class MojoHelperUtils
public static void copyBinaryFile( GenerateMojo mojo, String fileName, InputStream from, File to )
throws IOException
{
- FileOutputStream out = null;
-
mojo.getLog().info( "Copying " + fileName + " to " + to );
- try
+ try (FileOutputStream out = new FileOutputStream( to ))
{
- out = new FileOutputStream( to );
IOUtil.copy( from, out );
}
finally
{
IOUtil.close( from );
- IOUtil.close( out );
}
}
@@ -76,13 +72,9 @@ public class MojoHelperUtils
InputStream from, File to, boolean filtering ) throws IOException
{
// buffer so it isn't reading a byte at a time!
- Reader fileReader = null;
- Writer fileWriter = null;
- try
+ try (Reader fileReader = new BufferedReader( new InputStreamReader( from ) );
+ Writer fileWriter = new OutputStreamWriter( new FileOutputStream( to ) ) )
{
- fileReader = new BufferedReader( new InputStreamReader( from ) );
- fileWriter = new OutputStreamWriter( new FileOutputStream( to ) );
-
Reader reader = null;
if ( filtering )
{
@@ -107,11 +99,6 @@ public class MojoHelperUtils
}
IOUtil.copy( reader, fileWriter );
}
- finally
- {
- IOUtil.close( fileReader );
- IOUtil.close( fileWriter );
- }
}
Modified: directory/apacheds/trunk/interceptors/authn/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authn/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authn/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java (original)
+++ directory/apacheds/trunk/interceptors/authn/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java Mon Feb 23 14:43:08 2015
@@ -70,18 +70,20 @@ public class LdapPrincipalTest
{
LdapPrincipal principal = new LdapPrincipal( schemaManager );
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream out = new ObjectOutputStream( baos );
-
- LdapPrincipalSerializer.serialize( principal, out );
- out.flush();
-
- byte[] data = baos.toByteArray();
- ObjectInputStream in = new ObjectInputStream( new ByteArrayInputStream( data ) );
-
- LdapPrincipal readPrincipal = LdapPrincipalSerializer.deserialize( schemaManager, in );
- assertEquals( principal.getAuthenticationLevel(), readPrincipal.getAuthenticationLevel() );
- assertEquals( principal.getName(), readPrincipal.getName() );
+ try ( ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream( baos ) )
+ {
+
+ LdapPrincipalSerializer.serialize( principal, out );
+ out.flush();
+
+ byte[] data = baos.toByteArray();
+ ObjectInputStream in = new ObjectInputStream( new ByteArrayInputStream( data ) );
+
+ LdapPrincipal readPrincipal = LdapPrincipalSerializer.deserialize( schemaManager, in );
+ assertEquals( principal.getAuthenticationLevel(), readPrincipal.getAuthenticationLevel() );
+ assertEquals( principal.getName(), readPrincipal.getName() );
+ }
}
@@ -94,17 +96,19 @@ public class LdapPrincipalTest
LdapPrincipal principal = new LdapPrincipal( schemaManager, new Dn( schemaManager, "uid=admin,ou=system" ),
AuthenticationLevel.STRONG );
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream out = new ObjectOutputStream( baos );
-
- LdapPrincipalSerializer.serialize( principal, out );
- out.flush();
-
- byte[] data = baos.toByteArray();
- ObjectInputStream in = new ObjectInputStream( new ByteArrayInputStream( data ) );
-
- LdapPrincipal readPrincipal = LdapPrincipalSerializer.deserialize( schemaManager, in );
- assertEquals( principal.getAuthenticationLevel(), readPrincipal.getAuthenticationLevel() );
- assertEquals( principal.getName(), readPrincipal.getName() );
+ try ( ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream( baos ) )
+ {
+
+ LdapPrincipalSerializer.serialize( principal, out );
+ out.flush();
+
+ byte[] data = baos.toByteArray();
+ ObjectInputStream in = new ObjectInputStream( new ByteArrayInputStream( data ) );
+
+ LdapPrincipal readPrincipal = LdapPrincipalSerializer.deserialize( schemaManager, in );
+ assertEquals( principal.getAuthenticationLevel(), readPrincipal.getAuthenticationLevel() );
+ assertEquals( principal.getName(), readPrincipal.getName() );
+ }
}
}
Modified: directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java (original)
+++ directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java Mon Feb 23 14:43:08 2015
@@ -183,11 +183,8 @@ public class MemoryChangeLogStore implem
}
}
- PrintWriter out = null;
-
- try
+ try ( PrintWriter out = new PrintWriter( new FileWriter( revFile ) ) )
{
- out = new PrintWriter( new FileWriter( revFile ) );
out.println( currentRevision );
out.flush();
}
@@ -195,13 +192,6 @@ public class MemoryChangeLogStore implem
{
throw e;
}
- finally
- {
- if ( out != null )
- {
- out.close();
- }
- }
}
Modified: directory/apacheds/trunk/interceptors/changelog/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/changelog/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/changelog/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java (original)
+++ directory/apacheds/trunk/interceptors/changelog/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java Mon Feb 23 14:43:08 2015
@@ -125,12 +125,14 @@ public class MemoryChangeLogStoreTest
Strings.getBytesUtf8( "secret" ) );
ChangeLogEvent event = new ChangeLogEvent( revision, zuluTime, principal, forward, reverse );
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream out = new ObjectOutputStream( baos );
+ byte[] data = null;
+ try ( ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream( baos ) )
+ {
+ ChangeLogEventSerializer.serialize( event, out );
+ data = baos.toByteArray();
+ }
- ChangeLogEventSerializer.serialize( event, out );
-
- byte[] data = baos.toByteArray();
ObjectInputStream in = new ObjectInputStream( new ByteArrayInputStream( data ) );
ChangeLogEvent read = ChangeLogEventSerializer.deserialize( schemaManager, in );
Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DnSerializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DnSerializer.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DnSerializer.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DnSerializer.java Mon Feb 23 14:43:08 2015
@@ -81,21 +81,23 @@ public class DnSerializer implements Ser
{
Dn dn = ( Dn ) object;
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream( baos );
+ try ( ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream( baos ) )
+ {
- // First, the Dn
- dn.writeExternal( out );
+ // First, the Dn
+ dn.writeExternal( out );
- out.flush();
+ out.flush();
- if ( IS_DEBUG )
- {
- LOG.debug( ">------------------------------------------------" );
- LOG.debug( "Serialized " + dn );
- }
+ if ( IS_DEBUG )
+ {
+ LOG.debug( ">------------------------------------------------" );
+ LOG.debug( "Serialized " + dn );
+ }
- return baos.toByteArray();
+ return baos.toByteArray();
+ }
}
Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/IndexValueSerializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/IndexValueSerializer.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/IndexValueSerializer.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/IndexValueSerializer.java Mon Feb 23 14:43:08 2015
@@ -90,25 +90,27 @@ public class IndexValueSerializer implem
*/
private byte[] serialize( Long value ) throws IOException
{
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream out = new ObjectOutputStream( baos );
+ try ( ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream( baos ) )
+ {
- // First, write the type
- out.write( LONG_VALUE );
+ // First, write the type
+ out.write( LONG_VALUE );
- // Now, flush the Long
- out.writeLong( value );
+ // Now, flush the Long
+ out.writeLong( value );
- // And return the result
- out.flush();
+ // And return the result
+ out.flush();
- if ( LOG.isDebugEnabled() )
- {
- LOG.debug( ">------------------------------------------------" );
- LOG.debug( "Serializes a LONG value" );
- }
+ if ( LOG.isDebugEnabled() )
+ {
+ LOG.debug( ">------------------------------------------------" );
+ LOG.debug( "Serializes a LONG value" );
+ }
- return baos.toByteArray();
+ return baos.toByteArray();
+ }
}
Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ParentIdAndRdnSerializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ParentIdAndRdnSerializer.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ParentIdAndRdnSerializer.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ParentIdAndRdnSerializer.java Mon Feb 23 14:43:08 2015
@@ -82,45 +82,47 @@ public class ParentIdAndRdnSerializer im
{
ParentIdAndRdn parentIdAndRdn = ( ParentIdAndRdn ) object;
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream( baos );
-
- // First, the Dn
- Rdn[] rdns = parentIdAndRdn.getRdns();
-
- // Write the Rdn of the Dn
- if ( ( rdns == null ) || ( rdns.length == 0 ) )
- {
- out.writeByte( 0 );
- }
- else
+ try ( ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream( baos ) )
{
- out.writeByte( rdns.length );
- for ( Rdn rdn : rdns )
+ // First, the Dn
+ Rdn[] rdns = parentIdAndRdn.getRdns();
+
+ // Write the Rdn of the Dn
+ if ( ( rdns == null ) || ( rdns.length == 0 ) )
{
- rdn.writeExternal( out );
+ out.writeByte( 0 );
}
- }
+ else
+ {
+ out.writeByte( rdns.length );
- // Then the parentId.
- out.writeUTF( parentIdAndRdn.getParentId() );
+ for ( Rdn rdn : rdns )
+ {
+ rdn.writeExternal( out );
+ }
+ }
- // The number of children
- out.writeInt( parentIdAndRdn.getNbChildren() );
+ // Then the parentId.
+ out.writeUTF( parentIdAndRdn.getParentId() );
- // The number of descendants
- out.writeInt( parentIdAndRdn.getNbDescendants() );
+ // The number of children
+ out.writeInt( parentIdAndRdn.getNbChildren() );
- out.flush();
+ // The number of descendants
+ out.writeInt( parentIdAndRdn.getNbDescendants() );
- if ( IS_DEBUG )
- {
- LOG.debug( ">------------------------------------------------" );
- LOG.debug( "Serialize " + parentIdAndRdn );
- }
+ out.flush();
- return baos.toByteArray();
+ if ( IS_DEBUG )
+ {
+ LOG.debug( ">------------------------------------------------" );
+ LOG.debug( "Serialize " + parentIdAndRdn );
+ }
+
+ return baos.toByteArray();
+ }
}
Modified: directory/apacheds/trunk/kerberos-client/src/main/java/org/apache/directory/kerberos/credentials/cache/CredentialsCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-client/src/main/java/org/apache/directory/kerberos/credentials/cache/CredentialsCache.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-client/src/main/java/org/apache/directory/kerberos/credentials/cache/CredentialsCache.java (original)
+++ directory/apacheds/trunk/kerberos-client/src/main/java/org/apache/directory/kerberos/credentials/cache/CredentialsCache.java Mon Feb 23 14:43:08 2015
@@ -50,14 +50,12 @@ public class CredentialsCache
public static CredentialsCache load( InputStream is ) throws IOException
{
- CacheInputStream cis = new CacheInputStream(is);
-
- CredentialsCache credCache = new CredentialsCache();
- cis.read(credCache);
-
- cis.close();
-
- return credCache;
+ try ( CacheInputStream cis = new CacheInputStream(is) )
+ {
+ CredentialsCache credCache = new CredentialsCache();
+ cis.read(credCache);
+ return credCache;
+ }
}
public static void store( File fileName, CredentialsCache credCache ) throws IOException
Modified: directory/apacheds/trunk/kerberos-client/src/test/java/org/apache/directory/kerberos/client/CredentialsCacheTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-client/src/test/java/org/apache/directory/kerberos/client/CredentialsCacheTest.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-client/src/test/java/org/apache/directory/kerberos/client/CredentialsCacheTest.java (original)
+++ directory/apacheds/trunk/kerberos-client/src/test/java/org/apache/directory/kerberos/client/CredentialsCacheTest.java Mon Feb 23 14:43:08 2015
@@ -43,11 +43,10 @@ public class CredentialsCacheTest
public void testReadMITCredCache()
{
byte[] sampleCache = SampleCredentialsCacheResource.getCacheContent();
- ByteArrayInputStream bais = new ByteArrayInputStream(sampleCache);
- try
+ try ( ByteArrayInputStream bais = new ByteArrayInputStream(sampleCache) )
{
- CredentialsCache cc = CredentialsCache.load(bais);
+ CredentialsCache cc = CredentialsCache.load(bais);
PrincipalName principal = cc.getPrimaryPrincipalName();
assertTrue( principal.getNameString().equals( SampleCredentialsCacheResource.getSamplePrincipal() ) );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java Mon Feb 23 14:43:08 2015
@@ -224,39 +224,37 @@ public class Keytab
*/
protected static byte[] getBytesFromFile( File file ) throws IOException
{
- InputStream is = new FileInputStream( file );
-
- long length = file.length();
-
- // Check to ensure that file is not larger than Integer.MAX_VALUE.
- if ( length > Integer.MAX_VALUE )
+ try ( InputStream is = new FileInputStream( file ) )
{
- is.close();
- throw new IOException( I18n.err( I18n.ERR_618, file.getName() ) );
- }
- // Create the byte array to hold the data.
- byte[] bytes = new byte[( int ) length];
+ long length = file.length();
- // Read in the bytes
- int offset = 0;
- int numRead = 0;
- while ( offset < bytes.length && ( numRead = is.read( bytes, offset, bytes.length - offset ) ) >= 0 )
- {
- offset += numRead;
- }
+ // Check to ensure that file is not larger than Integer.MAX_VALUE.
+ if ( length > Integer.MAX_VALUE )
+ {
+ throw new IOException( I18n.err( I18n.ERR_618, file.getName() ) );
+ }
+
+ // Create the byte array to hold the data.
+ byte[] bytes = new byte[( int ) length];
+
+ // Read in the bytes
+ int offset = 0;
+ int numRead = 0;
+ while ( offset < bytes.length && ( numRead = is.read( bytes, offset, bytes.length - offset ) ) >= 0 )
+ {
+ offset += numRead;
+ }
+
+ // Ensure all the bytes have been read in.
+ if ( offset < bytes.length )
+ {
+ throw new IOException( I18n.err( I18n.ERR_619, file.getName() ) );
+ }
- // Ensure all the bytes have been read in.
- if ( offset < bytes.length )
- {
- is.close();
- throw new IOException( I18n.err( I18n.ERR_619, file.getName() ) );
- }
- // Close the input stream and return bytes.
- is.close();
-
- return bytes;
+ return bytes;
+ }
}
@@ -270,11 +268,10 @@ public class Keytab
protected void writeFile( ByteBuffer buffer, File file ) throws IOException
{
// Set append false to replace existing.
- FileChannel wChannel = new FileOutputStream( file, false ).getChannel();
-
- // Write the bytes between the position and limit.
- wChannel.write( buffer );
-
- wChannel.close();
+ try ( FileChannel wChannel = new FileOutputStream( file, false ).getChannel() )
+ {
+ // Write the bytes between the position and limit.
+ wChannel.write( buffer );
+ }
}
}
Modified: directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTestUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTestUtils.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTestUtils.java (original)
+++ directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTestUtils.java Mon Feb 23 14:43:08 2015
@@ -67,11 +67,9 @@ public class KerberosTestUtils
{
InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream( resource );
- Reader reader = new InputStreamReader( new BufferedInputStream( is ) );
-
CharArrayWriter writer = new CharArrayWriter();
- try
+ try ( Reader reader = new InputStreamReader( new BufferedInputStream( is ) ) )
{
char[] buf = new char[2048];
int len = 0;
@@ -84,16 +82,6 @@ public class KerberosTestUtils
}
}
}
- finally
- {
- try
- {
- reader.close();
- }
- catch ( IOException ioe )
- {
- }
- }
char[] isca = writer.toCharArray();
return isca;
@@ -104,12 +92,13 @@ public class KerberosTestUtils
{
InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream( resource );
- BufferedInputStream stream = new BufferedInputStream( is );
- int len = stream.available();
- byte[] bytes = new byte[len];
- stream.read( bytes, 0, len );
-
- return bytes;
+ try ( BufferedInputStream stream = new BufferedInputStream( is ) )
+ {
+ int len = stream.available();
+ byte[] bytes = new byte[len];
+ stream.read( bytes, 0, len );
+ return bytes;
+ }
}
Modified: directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotEntrySerializationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotEntrySerializationTest.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotEntrySerializationTest.java (original)
+++ directory/apacheds/trunk/mavibot-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotEntrySerializationTest.java Mon Feb 23 14:43:08 2015
@@ -127,16 +127,16 @@ public class MavibotEntrySerializationTe
entry1.writeExternal( out );
- ObjectInputStream in = null;
byte[] data = baos.toByteArray();
- in = new ObjectInputStream( new ByteArrayInputStream( data ) );
-
- Entry entry2 = new DefaultEntry();
- entry2.readExternal( in );
-
- assertEquals( entry1, entry2 );
- assertTrue( entry2.contains( "ObjectClass", "top", "domain" ) );
+ try ( ObjectInputStream in = new ObjectInputStream( new ByteArrayInputStream( data ) ) )
+ {
+ Entry entry2 = new DefaultEntry();
+ entry2.readExternal( in );
+
+ assertEquals( entry1, entry2 );
+ assertTrue( entry2.contains( "ObjectClass", "top", "domain" ) );
+ }
}
}
Modified: directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordDataEncoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordDataEncoder.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordDataEncoder.java (original)
+++ directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordDataEncoder.java Mon Feb 23 14:43:08 2015
@@ -46,15 +46,17 @@ public class ChangePasswordDataEncoder
*/
public byte[] encode( ChangePasswordData data ) throws IOException
{
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ASN1OutputStream aos = new ASN1OutputStream( baos );
+ try ( ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ASN1OutputStream aos = new ASN1OutputStream( baos ) )
+ {
+
+ DERSequence dataSequence = encodeDataSequence( data );
+ aos.writeObject( dataSequence );
+
+ aos.close();
- DERSequence dataSequence = encodeDataSequence( data );
- aos.writeObject( dataSequence );
-
- aos.close();
-
- return baos.toByteArray();
+ return baos.toByteArray();
+ }
}
@@ -67,12 +69,12 @@ public class ChangePasswordDataEncoder
*/
public void encode( ChangePasswordData data, ByteBuffer out ) throws IOException
{
- ASN1OutputStream aos = new ASN1OutputStream( out );
-
- DERSequence sequence = encodeDataSequence( data );
- aos.writeObject( sequence );
+ try ( ASN1OutputStream aos = new ASN1OutputStream( out ) )
+ {
- aos.close();
+ DERSequence sequence = encodeDataSequence( data );
+ aos.writeObject( sequence );
+ }
}
Modified: directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/AbstractDnsTestCase.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/AbstractDnsTestCase.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/AbstractDnsTestCase.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/AbstractDnsTestCase.java Mon Feb 23 14:43:08 2015
@@ -76,20 +76,20 @@ public abstract class AbstractDnsTestCas
protected IoBuffer getByteBufferFromFile( String file ) throws IOException
{
- InputStream is = getClass().getResourceAsStream( file );
-
- byte[] bytes = new byte[MINIMUM_DNS_DATAGRAM_SIZE];
-
- int offset = 0;
- int numRead = 0;
- while ( offset < bytes.length && ( numRead = is.read( bytes, offset, bytes.length - offset ) ) >= 0 )
+ try ( InputStream is = getClass().getResourceAsStream( file ) )
{
- offset += numRead;
- }
+ byte[] bytes = new byte[MINIMUM_DNS_DATAGRAM_SIZE];
- is.close();
+ int offset = 0;
+ int numRead = 0;
+ while ( offset < bytes.length && ( numRead = is.read( bytes, offset, bytes.length - offset ) ) >= 0 )
+ {
+ offset += numRead;
+ }
- return IoBuffer.wrap( bytes );
+ is.close();
+ return IoBuffer.wrap( bytes );
+ }
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Mon Feb 23 14:43:08 2015
@@ -380,19 +380,10 @@ public class LdapServer extends Director
else
{
keyStore = KeyStore.getInstance( KeyStore.getDefaultType() );
- FileInputStream fis = null;
- try
+ try ( FileInputStream fis = new FileInputStream( keystoreFile ) )
{
- fis = new FileInputStream( keystoreFile );
keyStore.load( fis, null );
}
- finally
- {
- if ( fis != null )
- {
- fis.close();
- }
- }
}
// Set up key manager factory to use our key store
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessageSerializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessageSerializer.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessageSerializer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessageSerializer.java Mon Feb 23 14:43:08 2015
@@ -78,21 +78,23 @@ public class ReplicaEventMessageSerializ
Entry entry = replicaEventMessage.getEntry();
ChangeType changeType = replicaEventMessage.getChangeType();
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream( baos );
+ try ( ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream( baos ) )
+ {
- // The change type first
- out.writeByte( changeType.getValue() );
+ // The change type first
+ out.writeByte( changeType.getValue() );
- // The entry DN
- entry.getDn().writeExternal( out );
+ // The entry DN
+ entry.getDn().writeExternal( out );
- // The entry
- entry.writeExternal( out );
+ // The entry
+ entry.writeExternal( out );
- out.flush();
+ out.flush();
- return baos.toByteArray();
+ return baos.toByteArray();
+ }
}
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java Mon Feb 23 14:43:08 2015
@@ -164,10 +164,9 @@ public class LdifConfigExtractor
private static void extractFromJar( File outputDirectory, String resource ) throws IOException
{
byte[] buf = new byte[512];
- InputStream in = DefaultSchemaLdifExtractor.getUniqueResourceAsStream( resource,
- "LDIF file in config repository" );
- try
+ try ( InputStream in = DefaultSchemaLdifExtractor.getUniqueResourceAsStream( resource,
+ "LDIF file in config repository" ) )
{
File destination = new File( outputDirectory, resource );
@@ -188,8 +187,7 @@ public class LdifConfigExtractor
}
}
- FileOutputStream out = new FileOutputStream( destination );
- try
+ try ( FileOutputStream out = new FileOutputStream( destination ) )
{
while ( in.available() > 0 )
{
@@ -198,14 +196,6 @@ public class LdifConfigExtractor
}
out.flush();
}
- finally
- {
- out.close();
- }
- }
- finally
- {
- in.close();
}
}
@@ -309,26 +299,24 @@ public class LdifConfigExtractor
LOG.debug( "URL of the config ldif file {}", configUrl );
- InputStream in = configUrl.openStream();
byte[] buf = new byte[1024 * 1024];
- FileWriter fw = new FileWriter( configFile );
-
- while ( true )
+ try ( InputStream in = configUrl.openStream();
+ FileWriter fw = new FileWriter( configFile ) )
{
- int read = in.read( buf );
-
- if ( read <= 0 )
+ while ( true )
{
- break;
- }
+ int read = in.read( buf );
- String s = Strings.utf8ToString( buf, 0, read );
- fw.write( s );
- }
+ if ( read <= 0 )
+ {
+ break;
+ }
- fw.close();
- in.close();
+ String s = Strings.utf8ToString( buf, 0, read );
+ fw.write( s );
+ }
+ }
LOG.info( "successfully extracted the config file {}", configFile.getAbsoluteFile() );
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java Mon Feb 23 14:43:08 2015
@@ -809,10 +809,11 @@ public class MockSyncReplConsumer implem
syncCookie ) ) ) );
}
- FileOutputStream fout = new FileOutputStream( cookieFile );
- fout.write( syncCookie.length );
- fout.write( syncCookie );
- fout.close();
+ try ( FileOutputStream fout = new FileOutputStream( cookieFile ) )
+ {
+ fout.write( syncCookie.length );
+ fout.write( syncCookie );
+ }
lastSavedCookie = new byte[syncCookie.length];
System.arraycopy( syncCookie, 0, lastSavedCookie, 0, syncCookie.length );
@@ -835,10 +836,11 @@ public class MockSyncReplConsumer implem
{
if ( ( cookieFile != null ) && cookieFile.exists() && ( cookieFile.length() > 0 ) )
{
- FileInputStream fin = new FileInputStream( cookieFile );
- syncCookie = new byte[fin.read()];
- fin.read( syncCookie );
- fin.close();
+ try ( FileInputStream fin = new FileInputStream( cookieFile ) )
+ {
+ syncCookie = new byte[fin.read()];
+ fin.read( syncCookie );
+ }
lastSavedCookie = new byte[syncCookie.length];
System.arraycopy( syncCookie, 0, lastSavedCookie, 0, syncCookie.length );
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java Mon Feb 23 14:43:08 2015
@@ -124,14 +124,16 @@ public class StartTlsConfidentialityIT e
byte[] userCertificate = entry.get( CERT_IDS[0] ).getBytes();
assertNotNull( userCertificate );
- ByteArrayInputStream in = new ByteArrayInputStream( userCertificate );
- CertificateFactory factory = CertificateFactory.getInstance( "X.509" );
- Certificate cert = factory.generateCertificate( in );
- KeyStore ks = KeyStore.getInstance( KeyStore.getDefaultType() );
- ks.load( null, null );
- ks.setCertificateEntry( "apacheds", cert );
- ks.store( new FileOutputStream( ksFile ), "changeit".toCharArray() );
- LOG.debug( "Keystore file installed: {}", ksFile.getAbsolutePath() );
+ try ( ByteArrayInputStream in = new ByteArrayInputStream( userCertificate ) )
+ {
+ CertificateFactory factory = CertificateFactory.getInstance( "X.509" );
+ Certificate cert = factory.generateCertificate( in );
+ KeyStore ks = KeyStore.getInstance( KeyStore.getDefaultType() );
+ ks.load( null, null );
+ ks.setCertificateEntry( "apacheds", cert );
+ ks.store( new FileOutputStream( ksFile ), "changeit".toCharArray() );
+ LOG.debug( "Keystore file installed: {}", ksFile.getAbsolutePath() );
+ }
oldConfidentialityRequiredValue = getLdapServer().isConfidentialityRequired();
}
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java Mon Feb 23 14:43:08 2015
@@ -118,14 +118,16 @@ public class StartTlsIT extends Abstract
byte[] userCertificate = entry.get( CERT_IDS[0] ).getBytes();
assertNotNull( userCertificate );
- ByteArrayInputStream in = new ByteArrayInputStream( userCertificate );
- CertificateFactory factory = CertificateFactory.getInstance( "X.509" );
- Certificate cert = factory.generateCertificate( in );
- KeyStore ks = KeyStore.getInstance( KeyStore.getDefaultType() );
- ks.load( null, null );
- ks.setCertificateEntry( "apacheds", cert );
- ks.store( new FileOutputStream( ksFile ), "changeit".toCharArray() );
- LOG.debug( "Keystore file installed: {}", ksFile.getAbsolutePath() );
+ try ( ByteArrayInputStream in = new ByteArrayInputStream( userCertificate ) )
+ {
+ CertificateFactory factory = CertificateFactory.getInstance( "X.509" );
+ Certificate cert = factory.generateCertificate( in );
+ KeyStore ks = KeyStore.getInstance( KeyStore.getDefaultType() );
+ ks.load( null, null );
+ ks.setCertificateEntry( "apacheds", cert );
+ ks.store( new FileOutputStream( ksFile ), "changeit".toCharArray() );
+ LOG.debug( "Keystore file installed: {}", ksFile.getAbsolutePath() );
+ }
oldConfidentialityRequiredValue = getLdapServer().isConfidentialityRequired();
}
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java?rev=1661689&r1=1661688&r2=1661689&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java Mon Feb 23 14:43:08 2015
@@ -115,14 +115,16 @@ public class StartTlsUpdateCertificateIT
byte[] userCertificate = entry.get( CERT_IDS[0] ).getBytes();
assertNotNull( userCertificate );
- ByteArrayInputStream in = new ByteArrayInputStream( userCertificate );
- CertificateFactory factory = CertificateFactory.getInstance( "X.509" );
- Certificate cert = factory.generateCertificate( in );
- KeyStore ks = KeyStore.getInstance( KeyStore.getDefaultType() );
- ks.load( null, null );
- ks.setCertificateEntry( "apacheds", cert );
- ks.store( new FileOutputStream( ksFile ), "changeit".toCharArray() );
- LOG.debug( "Keystore file installed: {}", ksFile.getAbsolutePath() );
+ try ( ByteArrayInputStream in = new ByteArrayInputStream( userCertificate ) )
+ {
+ CertificateFactory factory = CertificateFactory.getInstance( "X.509" );
+ Certificate cert = factory.generateCertificate( in );
+ KeyStore ks = KeyStore.getInstance( KeyStore.getDefaultType() );
+ ks.load( null, null );
+ ks.setCertificateEntry( "apacheds", cert );
+ ks.store( new FileOutputStream( ksFile ), "changeit".toCharArray() );
+ LOG.debug( "Keystore file installed: {}", ksFile.getAbsolutePath() );
+ }
oldConfidentialityRequiredValue = getLdapServer().isConfidentialityRequired();
}