directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1201201 - in /directory/apacheds/trunk: core-api/src/test/java/org/apache/directory/server/core/api/ core-integ/src/test/java/org/apache/directory/server/core/authz/support/ core-shared/src/main/java/org/apache/directory/server/core/shared...
Date Sat, 12 Nov 2011 05:59:02 GMT
Author: elecharny
Date: Sat Nov 12 05:59:01 2011
New Revision: 1201201

URL: http://svn.apache.org/viewvc?rev=1201201&view=rev
Log:
Replaced tabs by spaces

Modified:
    directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperation.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
    directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java
    directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/LogFlushManager.java

Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperation.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperation.java?rev=1201201&r1=1201200&r2=1201201&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperation.java
(original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperation.java
Sat Nov 12 05:59:01 2011
@@ -6,16 +6,16 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 package org.apache.directory.server.core.api;
 
@@ -44,7 +44,7 @@ public class MockOperation implements Op
     final CoreSession session;
 
 
-    public MockOperation( SchemaManager schemaManager, int count ) throws Exception 
+    public MockOperation( SchemaManager schemaManager, int count ) throws Exception
     {
         this.count = count;
         this.session = new MockCoreSession( new LdapPrincipal( schemaManager, new Dn( schemaManager
), AuthenticationLevel.STRONG ),
@@ -310,18 +310,18 @@ public class MockOperation implements Op
     }
 
 
-	@Override
-	public void setInterceptors( List<String> interceptors ) 
-	{
-		// TODO Auto-generated method stub
-		
-	}
+    @Override
+    public void setInterceptors( List<String> interceptors )
+    {
+        // TODO Auto-generated method stub
+        
+    }
 
 
-	@Override
-	public String getNextInterceptor() 
-	{
-		// TODO Auto-generated method stub
-		return "";
-	}
+    @Override
+    public String getNextInterceptor()
+    {
+        // TODO Auto-generated method stub
+        return "";
+    }
 }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=1201201&r1=1201200&r2=1201201&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
(original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
Sat Nov 12 05:59:01 2011
@@ -167,7 +167,7 @@ public class MaxImmSubFilterTest extends
 
     @Test
     @Ignore("test is failing cause of incorrect results from MaxImmSubFilter.filter() method
after " +
-    		"started using real OperationContext instead of MockOperationContext")
+            "started using real OperationContext instead of MockOperationContext")
     public void testGrantTuple() throws Exception
     {
         MaxImmSubFilter filter = new MaxImmSubFilter( schemaManager );

Modified: directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java?rev=1201201&r1=1201200&r2=1201201&view=diff
==============================================================================
--- directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java
(original)
+++ directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java
Sat Nov 12 05:59:01 2011
@@ -31,7 +31,6 @@ import org.apache.directory.server.const
 import org.apache.directory.server.core.api.CoreSession;
 import org.apache.directory.server.core.api.DirectoryService;
 import org.apache.directory.server.core.api.LdapPrincipal;
-import org.apache.directory.server.core.api.OperationEnum;
 import org.apache.directory.server.core.api.OperationManager;
 import org.apache.directory.server.core.api.changelog.LogChange;
 import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
@@ -88,7 +87,7 @@ import org.apache.directory.shared.util.
  */
 public class DefaultCoreSession implements CoreSession
 {
-	/** The DirectoryService we are connected to */
+    /** The DirectoryService we are connected to */
     private final DirectoryService directoryService;
     
     /** The Principal used to process operations */
@@ -118,7 +117,7 @@ public class DefaultCoreSession implemen
      * Set the ignoreRefferal flag for the current operationContext.
      *
      * @param opContext The current operationContext
-     * @param ignoreReferral The flag 
+     * @param ignoreReferral The flag
      */
     private void setReferralHandling( AbstractOperationContext opContext, boolean ignoreReferral
)
     {
@@ -134,7 +133,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void add( Entry entry ) throws LdapException
     {
@@ -143,7 +142,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void add( Entry entry, boolean ignoreReferral ) throws LdapException
     {
@@ -152,7 +151,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void add( Entry entry, LogChange log ) throws LdapException
     {
@@ -166,7 +165,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void add( Entry entry, boolean ignoreReferral, LogChange log ) throws LdapException
     {
@@ -181,7 +180,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void add( AddRequest addRequest ) throws LdapException
     {
@@ -190,7 +189,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void add( AddRequest addRequest, LogChange log ) throws LdapException
     {
@@ -440,7 +439,7 @@ public class DefaultCoreSession implemen
     /**
      * TODO - perhaps we should just use a flag that is calculated on creation
      * of this session
-     *  
+     * 
      * @see org.apache.directory.server.core.api.CoreSession#isAdministrator()
      */
     public boolean isAdministrator()
@@ -452,13 +451,13 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * TODO - this method impl does not check to see if the principal is in 
+     * TODO - this method impl does not check to see if the principal is in
      * the administrators group - it only returns true of the principal is
      * the actual admin user.  need to make it check groups.
      * 
      * TODO - perhaps we should just use a flag that is calculated on creation
      * of this session
-     *  
+     * 
      * @see org.apache.directory.server.core.api.CoreSession#isAnAdministrator()
      */
     public boolean isAnAdministrator()
@@ -506,7 +505,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public Entry lookup( Dn dn ) throws LdapException
     {
@@ -629,7 +628,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void move( Dn dn, Dn newParent ) throws LdapException
     {
@@ -638,7 +637,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void move( Dn dn, Dn newParent, LogChange log ) throws LdapException
     {
@@ -651,7 +650,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void move( Dn dn, Dn newParent, boolean ignoreReferral ) throws Exception
     {
@@ -660,7 +659,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void move( Dn dn, Dn newParent, boolean ignoreReferral, LogChange log ) throws
LdapException
     {
@@ -675,7 +674,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void moveAndRename( Dn dn, Dn newParent, Rdn newRdn, boolean deleteOldRdn ) throws
LdapException
     {
@@ -684,7 +683,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void moveAndRename( Dn dn, Dn newSuperiorDn, Rdn newRdn, boolean deleteOldRdn,
LogChange log )
         throws LdapException
@@ -700,7 +699,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void moveAndRename( Dn dn, Dn newParent, Rdn newRdn, boolean deleteOldRdn, boolean
ignoreReferral )
         throws LdapException
@@ -710,7 +709,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void moveAndRename( Dn dn, Dn newParent, Rdn newRdn, boolean deleteOldRdn, boolean
ignoreReferral,
         LogChange log ) throws LdapException
@@ -794,7 +793,7 @@ public class DefaultCoreSession implemen
 
         try
         {
-            filterNode = ( ExprNode ) FilterParser.parse( directoryService.getSchemaManager(),
filter );
+            filterNode = FilterParser.parse( directoryService.getSchemaManager(), filter
);
         }
         catch ( ParseException pe )
         {
@@ -906,7 +905,7 @@ public class DefaultCoreSession implemen
     
     
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public boolean exists( String dn ) throws LdapException
     {
@@ -915,7 +914,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public boolean exists( Dn dn ) throws LdapException
     {
@@ -961,7 +960,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void move( ModifyDnRequest modifyDnRequest ) throws LdapException
     {
@@ -970,7 +969,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void move( ModifyDnRequest modifyDnRequest, LogChange log ) throws LdapException
     {
@@ -995,7 +994,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void moveAndRename( ModifyDnRequest modifyDnRequest ) throws LdapException
     {
@@ -1004,7 +1003,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void moveAndRename( ModifyDnRequest modifyDnRequest, LogChange log ) throws LdapException
     {
@@ -1090,8 +1089,8 @@ public class DefaultCoreSession implemen
      */
     public void unbind() throws LdapException
     {
-    	UnbindOperationContext unbindContext = new UnbindOperationContext( this );
-    	
+        UnbindOperationContext unbindContext = new UnbindOperationContext( this );
+        
         OperationManager operationManager = directoryService.getOperationManager();
         operationManager.unbind( unbindContext );
     }
@@ -1102,8 +1101,8 @@ public class DefaultCoreSession implemen
      */
     public void unbind( UnbindRequest unbindRequest ) throws LdapException
     {
-    	UnbindOperationContext unbindContext = new UnbindOperationContext( this, unbindRequest
);
-    	
+        UnbindOperationContext unbindContext = new UnbindOperationContext( this, unbindRequest
);
+        
         OperationManager operationManager = directoryService.getOperationManager();
         operationManager.unbind( unbindContext );
     }

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java?rev=1201201&r1=1201200&r2=1201201&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
(original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
Sat Nov 12 05:59:01 2011
@@ -463,7 +463,7 @@ public class KdcReqBody extends Abstract
     @Override
     public int computeLength()
     {
-    	reset();
+        reset();
 
         // The KdcOptions length
         kdcOptionsLength = 1 + 1 + kdcOptions.getBytes().length;

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java?rev=1201201&r1=1201200&r2=1201201&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
(original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
Sat Nov 12 05:59:01 2011
@@ -6,16 +6,16 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 package org.apache.directory.shared.kerberos.messages;
 
@@ -200,11 +200,11 @@ public class ApReq extends KerberosMessa
      *        +--> 0xA1 0x03 msg-type tag
      *        |     |
      *        |     +--> 0x02 0x01 0x0E msg-type (14)
-     *        |     
+     *        |
      *        +--> 0xA2 0x03 APOptions tag
      *        |     |
      *        |     +--> 0x03 0x05 0x00 b1 b2 b3 b4 APOtions
-     *        |     
+     *        |
      *        +--> 0xA3 L3 ticket tag
      *        |     |
      *        |     +--> 0x61 L3-1 ticket
@@ -216,8 +216,8 @@ public class ApReq extends KerberosMessa
      */
     public int computeLength()
     {
-    	reset();
-    	
+        reset();
+        
         // Compute the PVNO length.
         pvnoLength = 1 + 1 + Value.getNbBytes( getProtocolVersionNumber() );
 
@@ -234,10 +234,10 @@ public class ApReq extends KerberosMessa
         authenticatorLength = authenticator.computeLength();
         
         // Compute the sequence size
-        apReqLength = 
+        apReqLength =
             1 + TLV.getNbBytes( pvnoLength ) + pvnoLength +
             1 + TLV.getNbBytes( msgTypeLength ) + msgTypeLength +
-            1 + TLV.getNbBytes( apOptionsLength ) + apOptionsLength + 
+            1 + TLV.getNbBytes( apOptionsLength ) + apOptionsLength +
             1 + TLV.getNbBytes( ticketLength ) + ticketLength +
             1 + TLV.getNbBytes( authenticatorLength ) + authenticatorLength;
         
@@ -313,7 +313,7 @@ public class ApReq extends KerberosMessa
         }
         catch ( BufferOverflowException boe )
         {
-            LOG.error( I18n.err( I18n.ERR_137, 1 + TLV.getNbBytes( apReqLength ) + apReqLength,

+            LOG.error( I18n.err( I18n.ERR_137, 1 + TLV.getNbBytes( apReqLength ) + apReqLength,
                 buffer.capacity() ) );
             throw new EncoderException( I18n.err( I18n.ERR_138 ) );
         }
@@ -333,13 +333,13 @@ public class ApReq extends KerberosMessa
      */
     private void reset()
     {
-    	pvnoLength = 0;
+        pvnoLength = 0;
         msgTypeLength = 0;
         apOptionsLength = 0;
         ticketLength = 0;
         authenticatorLength = 0;
         apReqLength = 0;
-        apReqSeqLength = 0;	
+        apReqSeqLength = 0;
     }
     
     

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java?rev=1201201&r1=1201200&r2=1201201&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
(original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
Sat Nov 12 05:59:01 2011
@@ -6,16 +6,16 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 package org.apache.directory.shared.kerberos.messages;
 
@@ -326,8 +326,8 @@ public class Authenticator extends Kerbe
     @Override
     public int computeLength()
     {
-    	reset();
-    	
+        reset();
+        
         // Compute the Authenticator version length.
         authenticatorVnoLength = 1 + 1 + Value.getNbBytes( getProtocolVersionNumber() );
         authenticatorSeqLength =  1 + TLV.getNbBytes( authenticatorVnoLength ) + authenticatorVnoLength;
@@ -385,15 +385,15 @@ public class Authenticator extends Kerbe
     
 
     /**
-     * Encode the Authenticator message to a PDU. 
+     * Encode the Authenticator message to a PDU.
      * <pre>
      * Authenticator :
      * 
      * 0x62 LL
      *   0x30 LL
-     *     0xA0 0x03 
-     *       0x02 0x01 0x05 authenticator-vno 
-     *     0xA1 LL 
+     *     0xA0 0x03
+     *       0x02 0x01 0x05 authenticator-vno
+     *     0xA1 LL
      *       0x1B LL abcd crealm
      *     0xA2 LL
      *       0x30 LL abcd cname
@@ -481,7 +481,7 @@ public class Authenticator extends Kerbe
             buffer.put( TLV.getBytes( ctimeLength ) );
             
             // The value
-            buffer.put( (byte)UniversalTag.GENERALIZED_TIME.getValue() );
+            buffer.put( UniversalTag.GENERALIZED_TIME.getValue() );
             buffer.put( (byte)0x0F );
             buffer.put( ctime.getBytes() );
             
@@ -537,7 +537,7 @@ public class Authenticator extends Kerbe
      */
     private void reset()
     {
-    	authenticatorVnoLength = 0;
+        authenticatorVnoLength = 0;
         crealmLength = 0;
         crealmBytes = null;
         cnameLength = 0;
@@ -548,7 +548,7 @@ public class Authenticator extends Kerbe
         seqNumberLength = 0;
         authorizationDataLength = 0;
         authenticatorSeqLength = 0;
-        authenticatorLength = 0;	
+        authenticatorLength = 0;
     }
     
     

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java?rev=1201201&r1=1201200&r2=1201201&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java
(original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java
Sat Nov 12 05:59:01 2011
@@ -6,16 +6,16 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 package org.apache.directory.shared.kerberos.messages;
 
@@ -46,7 +46,7 @@ public class TgsReq extends KdcReq
     /**
      * Creates a new instance of TGS-REQ.
      */
-    public TgsReq() 
+    public TgsReq()
     {
         super( KerberosMessageType.TGS_REQ );
     }
@@ -64,9 +64,9 @@ public class TgsReq extends KdcReq
      */
     public int computeLength()
     {
-    	kdcReqLength = 0;
-    	tgsReqLength = 0;
-    	
+        kdcReqLength = 0;
+        tgsReqLength = 0;
+        
         kdcReqLength = super.computeLength();
         tgsReqLength = 1 + TLV.getNbBytes( kdcReqLength ) + kdcReqLength;
         

Modified: directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java?rev=1201201&r1=1201200&r2=1201201&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java
(original)
+++ directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java
Sat Nov 12 05:59:01 2011
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertEqu
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.Collections;
 
 import javax.security.auth.Subject;
@@ -106,7 +105,7 @@ public class AbstractKerberosITest exten
 
 
     /**
-     * Obtains a TGT and service tickets for the user. 
+     * Obtains a TGT and service tickets for the user.
      * Also makes some assertions on the received tickets.
      *
      * @param encryptionType the encryption type to use
@@ -152,7 +151,7 @@ public class AbstractKerberosITest exten
     }
 
 
-    protected void setupEnv( ObtainTicketParameters parameters ) 
+    protected void setupEnv( ObtainTicketParameters parameters )
         throws Exception
     {
         // Save current value of sun.security.krb5.KrbKdcReq.udpPrefLimit field.
@@ -184,7 +183,7 @@ public class AbstractKerberosITest exten
             "ldap", "randall", servicePrincipal );
     }
     
-    protected void resetEnv( ObtainTicketParameters parameters ) 
+    protected void resetEnv( ObtainTicketParameters parameters )
         throws Exception
     {
         setUdpPrefLimit( parameters.oldUdpPrefLimit );
@@ -216,12 +215,12 @@ public class AbstractKerberosITest exten
         Field udpPrefLimitField = null;
         
         try
-        { 
-        	udpPrefLimitField = krbKdcReqClass.getDeclaredField( "udpPrefLimit" );
+        {
+            udpPrefLimitField = krbKdcReqClass.getDeclaredField( "udpPrefLimit" );
         }
         catch ( NoSuchFieldException nsfe )
         {
-        	udpPrefLimitField = krbKdcReqClass.getDeclaredField( "defaultUdpPrefLimit" );
+            udpPrefLimitField = krbKdcReqClass.getDeclaredField( "defaultUdpPrefLimit" );
         }
         
         udpPrefLimitField.setAccessible( true );
@@ -276,7 +275,7 @@ public class AbstractKerberosITest exten
      * </pre>
      *
      * @param encryptionType
-     * @param checksumType 
+     * @param checksumType
      * @return the path to the krb5.conf file
      * @throws IOException
      */

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/LogFlushManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/LogFlushManager.java?rev=1201201&r1=1201200&r2=1201201&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/LogFlushManager.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/LogFlushManager.java
Sat Nov 12 05:59:01 2011
@@ -35,11 +35,11 @@ import org.apache.directory.server.log.L
 import org.apache.directory.server.log.UserLogRecord;
 
 /**
- * Manages the flushing of log to media and scanning of logs. All appends to the log file
go through this class. 
+ * Manages the flushing of log to media and scanning of logs. All appends to the log file
go through this class.
  *
- * Internally it manages a circular  buffer where appends initially go. Appends are first

+ * Internally it manages a circular  buffer where appends initially go. Appends are first
  * appended to this in memory circular log. As the in memory circular log fills up or as
the user requests
- *  memory buffer is flushed to the underlying media.  
+ *  memory buffer is flushed to the underlying media.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -65,7 +65,7 @@ class LogFlushManager
     private LogBuffer logBuffer;
     
     /** Flush status */
-    private FlushStatus flushStatus = new FlushStatus(); 
+    private FlushStatus flushStatus = new FlushStatus();
        
     /** Current LogFile appends go to */
     private LogFileManager.LogFileWriter currentLogFile;
@@ -109,7 +109,7 @@ class LogFlushManager
         boolean appendedRecord = false;
         byte[] userBuffer = userRecord.getDataBuffer();
         int length  = userRecord.getDataLength();
-        LogAnchor userLogAnchor = userRecord.getLogAnchor(); 
+        LogAnchor userLogAnchor = userRecord.getLogAnchor();
         
         int recordSize = LogFileRecords.RECORD_HEADER_SIZE + LogFileRecords.RECORD_FOOTER_SIZE
+ length;
         
@@ -142,10 +142,10 @@ class LogFlushManager
                 {
                     // First get the rewind count then the position to which the readhead
advanced
                     int readHeadRewindCount = logBuffer.readHeadRewindCount.get();
-                    int readHeadPosition = logBuffer.readHeadPosition;                
+                    int readHeadPosition = logBuffer.readHeadPosition;
                     
-                    if ( ( logBuffer.writeHeadRewindCount == readHeadRewindCount ) || 
-                        ( ( logBuffer.writeHeadRewindCount == readHeadRewindCount + 1 ) &&

+                    if ( ( logBuffer.writeHeadRewindCount == readHeadRewindCount ) ||
+                        ( ( logBuffer.writeHeadRewindCount == readHeadRewindCount + 1 ) &&
                             ( readHeadPosition < writeHead.position() ) ) )
                     {
                         if ( writeHead.remaining() >= recordSize )
@@ -168,9 +168,9 @@ class LogFlushManager
                             logBuffer.writeHeadRewindCount++;
                         }
                     }
-                    else 
+                    else
                     {
-                        assert( logBuffer.writeHeadRewindCount == ( readHeadRewindCount +
1 ) ) : 
+                        assert( logBuffer.writeHeadRewindCount == ( readHeadRewindCount +
1 ) ) :
                                 "Unexpected sequence number for read/write heads:" + logBuffer.writeHeadRewindCount
+
                                 " " + readHeadRewindCount;
                         
@@ -190,7 +190,7 @@ class LogFlushManager
                 
             }
             else
-            {   
+            {
                 this.flush( lsn, userBuffer, 0, length, true );
             }
             
@@ -223,10 +223,10 @@ class LogFlushManager
      * and is woken up to do its flush.
      * 
      * flushStatus.uptoLSN represents the highest lsn that any thread wanted to sync. If
a couple of threads wait on sync to
-     * complete, the thread that wakes up and does the sync will take it for the team and
sync upto flushStatus.uptoLSN so 
+     * complete, the thread that wakes up and does the sync will take it for the team and
sync upto flushStatus.uptoLSN so
      * that logging is more efficient.
      * 
-     *  
+     * 
      *
      * @param flushLSN max LSN the calling thread wants to sync upto
      * @param userBuffer if not null, user buffer is appended to the log without any buffering
@@ -235,9 +235,9 @@ class LogFlushManager
      * @param appendLockHeld true if append lock is held
      * @throws IOException
      */
-    private void flush( long flushLSN, byte[] userBuffer, int offset, int length, 
+    private void flush( long flushLSN, byte[] userBuffer, int offset, int length,
                         boolean appendLockHeld ) throws IOException
-    {    
+    {
         long uptoLSN = flushLSN;
        
         if ( appendLockHeld == true )
@@ -264,7 +264,7 @@ class LogFlushManager
             {
                 flushLock.unlock();
                 return;
-            }      
+            }
             
             if ( flushStatus.flushInProgress == false )
             {
@@ -293,7 +293,7 @@ class LogFlushManager
         
         long flushedLSN = this.doFlush( uptoLSN, appendLockHeld );
         
-        // Now if there is a user buffer, flush from that        
+        // Now if there is a user buffer, flush from that
         if ( userBuffer != null )
         {
             ByteBuffer headerFooterHead = logBuffer.headerFooterHead;
@@ -302,7 +302,7 @@ class LogFlushManager
             this.writeHeader( headerFooterHead, length, flushLSN );
             currentLogFile.append( logBuffer.headerFooterBuffer, 0, LogFileRecords.RECORD_HEADER_MAGIC_NUMBER
);
             
-            currentLogFile.append( userBuffer, offset, length );   
+            currentLogFile.append( userBuffer, offset, length );
             
             headerFooterHead.rewind();
             this.writeFooter( headerFooterHead, 0 );
@@ -383,8 +383,8 @@ class LogFlushManager
                 magicNumber = readHead.getInt();
                 
                 assert( magicNumber == LogFileRecords.RECORD_HEADER_MAGIC_NUMBER ) : " Record
header magic " +
-                		"number does not match " + magicNumber + " expected "+ 
-                		LogFileRecords.RECORD_HEADER_MAGIC_NUMBER;
+                        "number does not match " + magicNumber + " expected "+
+                        LogFileRecords.RECORD_HEADER_MAGIC_NUMBER;
                 
                 length = readHead.getInt();
                 
@@ -417,10 +417,10 @@ class LogFlushManager
             // If there is something to flush, then do it now
             if ( totalLength > 0 )
             {
-                int offset;                 
+                int offset;
                 offset = logBuffer.readHeadPosition;
                 
-                currentLogFile.append( logBuffer.buffer, offset, totalLength );         
  
+                currentLogFile.append( logBuffer.buffer, offset, totalLength );
                        
                 //move the position to the next record
                 logBuffer.readHeadPosition = readHead.position();
@@ -444,7 +444,7 @@ class LogFlushManager
         buffer.putInt( LogFileRecords.RECORD_HEADER_MAGIC_NUMBER );
         buffer.putInt( length );
         buffer.putLong( lsn );
-        buffer.putLong( length ^ lsn ); 
+        buffer.putLong( length ^ lsn );
     }
     
     private void writeFooter ( ByteBuffer buffer, int checksum )
@@ -455,10 +455,10 @@ class LogFlushManager
     
     
     /**
-     * Used to group the memory buffer data together 
+     * Used to group the memory buffer data together
      */
     private static class LogBuffer
-    {        
+    {
         /** In memory buffer */
         byte buffer[];
                 



Mime
View raw message