Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

whitespace consistency in ActionQueue

This commit is contained in:
Sanne Grinovero 2011-10-14 14:27:37 +01:00
parent e93a83f5c2
commit 9f1b53fd1e
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
View File

@ -30,12 +30,10 @@ import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import org.hibernate.persister.entity.EntityPersister;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
import org.hibernate.AssertionFailure; import org.hibernate.AssertionFailure;
@ -254,7 +252,7 @@ public class ActionQueue {
final Serializable[] spaces = action.getPropertySpaces(); final Serializable[] spaces = action.getPropertySpaces();
for ( Serializable space : spaces ) { for ( Serializable space : spaces ) {
if ( tableSpaces.contains( space ) ) { if ( tableSpaces.contains( space ) ) {
LOG.debugf("Changes must be flushed to space: %s", space); LOG.debugf( "Changes must be flushed to space: %s", space );
return true; return true;
} }
} }
@ -416,45 +414,45 @@ public class ActionQueue {
* @throws IOException Indicates an error writing to the stream * @throws IOException Indicates an error writing to the stream
*/ */
public void serialize(ObjectOutputStream oos) throws IOException { public void serialize(ObjectOutputStream oos) throws IOException {
if(TRACE) LOG.trace("Serializing action-queue"); if ( TRACE ) LOG.trace( "Serializing action-queue" );
int queueSize = insertions.size(); int queueSize = insertions.size();
if(TRACE) LOG.trace("Starting serialization of [" + queueSize + "] insertions entries"); if ( TRACE ) LOG.trace( "Starting serialization of [" + queueSize + "] insertions entries" );
oos.writeInt( queueSize ); oos.writeInt( queueSize );
for ( int i = 0; i < queueSize; i++ ) { for ( int i = 0; i < queueSize; i++ ) {
oos.writeObject( insertions.get( i ) ); oos.writeObject( insertions.get( i ) );
} }
queueSize = deletions.size(); queueSize = deletions.size();
if(TRACE) LOG.trace("Starting serialization of [" + queueSize + "] deletions entries"); if ( TRACE ) LOG.trace( "Starting serialization of [" + queueSize + "] deletions entries" );
oos.writeInt( queueSize ); oos.writeInt( queueSize );
for ( int i = 0; i < queueSize; i++ ) { for ( int i = 0; i < queueSize; i++ ) {
oos.writeObject( deletions.get( i ) ); oos.writeObject( deletions.get( i ) );
} }
queueSize = updates.size(); queueSize = updates.size();
if(TRACE) LOG.trace("Starting serialization of [" + queueSize + "] updates entries"); if ( TRACE ) LOG.trace( "Starting serialization of [" + queueSize + "] updates entries" );
oos.writeInt( queueSize ); oos.writeInt( queueSize );
for ( int i = 0; i < queueSize; i++ ) { for ( int i = 0; i < queueSize; i++ ) {
oos.writeObject( updates.get( i ) ); oos.writeObject( updates.get( i ) );
} }
queueSize = collectionUpdates.size(); queueSize = collectionUpdates.size();
if(TRACE) LOG.trace("Starting serialization of [" + queueSize + "] collectionUpdates entries"); if ( TRACE ) LOG.trace( "Starting serialization of [" + queueSize + "] collectionUpdates entries" );
oos.writeInt( queueSize ); oos.writeInt( queueSize );
for ( int i = 0; i < queueSize; i++ ) { for ( int i = 0; i < queueSize; i++ ) {
oos.writeObject( collectionUpdates.get( i ) ); oos.writeObject( collectionUpdates.get( i ) );
} }
queueSize = collectionRemovals.size(); queueSize = collectionRemovals.size();
if(TRACE) LOG.trace("Starting serialization of [" + queueSize + "] collectionRemovals entries"); if ( TRACE ) LOG.trace( "Starting serialization of [" + queueSize + "] collectionRemovals entries" );
oos.writeInt( queueSize ); oos.writeInt( queueSize );
for ( int i = 0; i < queueSize; i++ ) { for ( int i = 0; i < queueSize; i++ ) {
oos.writeObject( collectionRemovals.get( i ) ); oos.writeObject( collectionRemovals.get( i ) );
} }
queueSize = collectionCreations.size(); queueSize = collectionCreations.size();
if(TRACE) LOG.trace("Starting serialization of [" + queueSize + "] collectionCreations entries"); if ( TRACE ) LOG.trace( "Starting serialization of [" + queueSize + "] collectionCreations entries" );
oos.writeInt( queueSize ); oos.writeInt( queueSize );
for ( int i = 0; i < queueSize; i++ ) { for ( int i = 0; i < queueSize; i++ ) {
oos.writeObject( collectionCreations.get( i ) ); oos.writeObject( collectionCreations.get( i ) );
@ -477,11 +475,11 @@ public class ActionQueue {
public static ActionQueue deserialize( public static ActionQueue deserialize(
ObjectInputStream ois, ObjectInputStream ois,
SessionImplementor session) throws IOException, ClassNotFoundException { SessionImplementor session) throws IOException, ClassNotFoundException {
if(TRACE) LOG.trace("Dedeserializing action-queue"); if ( TRACE ) LOG.trace( "Dedeserializing action-queue" );
ActionQueue rtn = new ActionQueue( session ); ActionQueue rtn = new ActionQueue( session );
int queueSize = ois.readInt(); int queueSize = ois.readInt();
if(TRACE) LOG.trace("Starting deserialization of [" + queueSize + "] insertions entries"); if ( TRACE ) LOG.trace( "Starting deserialization of [" + queueSize + "] insertions entries" );
rtn.insertions = new ArrayList<Executable>( queueSize ); rtn.insertions = new ArrayList<Executable>( queueSize );
for ( int i = 0; i < queueSize; i++ ) { for ( int i = 0; i < queueSize; i++ ) {
EntityAction action = ( EntityAction ) ois.readObject(); EntityAction action = ( EntityAction ) ois.readObject();
@ -490,7 +488,7 @@ public class ActionQueue {
} }
queueSize = ois.readInt(); queueSize = ois.readInt();
if(TRACE) LOG.trace("Starting deserialization of [" + queueSize + "] deletions entries"); if ( TRACE ) LOG.trace( "Starting deserialization of [" + queueSize + "] deletions entries" );
rtn.deletions = new ArrayList<Executable>( queueSize ); rtn.deletions = new ArrayList<Executable>( queueSize );
for ( int i = 0; i < queueSize; i++ ) { for ( int i = 0; i < queueSize; i++ ) {
EntityAction action = ( EntityAction ) ois.readObject(); EntityAction action = ( EntityAction ) ois.readObject();
@ -499,7 +497,7 @@ public class ActionQueue {
} }
queueSize = ois.readInt(); queueSize = ois.readInt();
if(TRACE) LOG.trace("Starting deserialization of [" + queueSize + "] updates entries"); if ( TRACE ) LOG.trace( "Starting deserialization of [" + queueSize + "] updates entries" );
rtn.updates = new ArrayList<Executable>( queueSize ); rtn.updates = new ArrayList<Executable>( queueSize );
for ( int i = 0; i < queueSize; i++ ) { for ( int i = 0; i < queueSize; i++ ) {
EntityAction action = ( EntityAction ) ois.readObject(); EntityAction action = ( EntityAction ) ois.readObject();
@ -508,7 +506,7 @@ public class ActionQueue {
} }
queueSize = ois.readInt(); queueSize = ois.readInt();
if(TRACE) LOG.trace("Starting deserialization of [" + queueSize + "] collectionUpdates entries"); if ( TRACE ) LOG.trace( "Starting deserialization of [" + queueSize + "] collectionUpdates entries" );
rtn.collectionUpdates = new ArrayList<Executable>( queueSize ); rtn.collectionUpdates = new ArrayList<Executable>( queueSize );
for ( int i = 0; i < queueSize; i++ ) { for ( int i = 0; i < queueSize; i++ ) {
CollectionAction action = (CollectionAction) ois.readObject(); CollectionAction action = (CollectionAction) ois.readObject();
@ -517,7 +515,7 @@ public class ActionQueue {
} }
queueSize = ois.readInt(); queueSize = ois.readInt();
if(TRACE) LOG.trace("Starting deserialization of [" + queueSize + "] collectionRemovals entries"); if ( TRACE ) LOG.trace( "Starting deserialization of [" + queueSize + "] collectionRemovals entries" );
rtn.collectionRemovals = new ArrayList<Executable>( queueSize ); rtn.collectionRemovals = new ArrayList<Executable>( queueSize );
for ( int i = 0; i < queueSize; i++ ) { for ( int i = 0; i < queueSize; i++ ) {
CollectionAction action = ( CollectionAction ) ois.readObject(); CollectionAction action = ( CollectionAction ) ois.readObject();
@ -526,7 +524,7 @@ public class ActionQueue {
} }
queueSize = ois.readInt(); queueSize = ois.readInt();
if(TRACE) LOG.trace("Starting deserialization of [" + queueSize + "] collectionCreations entries"); if ( TRACE ) LOG.trace( "Starting deserialization of [" + queueSize + "] collectionCreations entries" );
rtn.collectionCreations = new ArrayList<Executable>( queueSize ); rtn.collectionCreations = new ArrayList<Executable>( queueSize );
for ( int i = 0; i < queueSize; i++ ) { for ( int i = 0; i < queueSize; i++ ) {
CollectionAction action = ( CollectionAction ) ois.readObject(); CollectionAction action = ( CollectionAction ) ois.readObject();
@ -607,7 +605,7 @@ public class ActionQueue {
process.doAfterTransactionCompletion( success, session ); process.doAfterTransactionCompletion( success, session );
} }
catch ( CacheException ce ) { catch ( CacheException ce ) {
LOG.unableToReleaseCacheLock(ce); LOG.unableToReleaseCacheLock( ce );
// continue loop // continue loop
} }
catch ( Exception e ) { catch ( Exception e ) {