Author: sannegrinovero Date: 2010-03-29 18:35:23 -0400 (Mon, 29 Mar 2010) New Revision: 19130 Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/AddLuceneWork.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/DeleteLuceneWork.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/WorkQueue.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java Log: cleanup code after doubly-applied patch Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/AddLuceneWork.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/AddLuceneWork.java 2010-03-29 15:26:12 UTC (rev 19129) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/AddLuceneWork.java 2010-03-29 22:35:23 UTC (rev 19130) @@ -66,7 +66,7 @@ @Override public String toString() { - return "Add LuceneWork: " + this.getEntityClass().getSimpleName() + "#" + this.getIdInString(); + return "AddLuceneWork: " + this.getEntityClass().getName() + "#" + this.getIdInString(); } } Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/DeleteLuceneWork.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/DeleteLuceneWork.java 2010-03-29 15:26:12 UTC (rev 19129) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/DeleteLuceneWork.java 2010-03-29 22:35:23 UTC (rev 19130) @@ -44,6 +44,7 @@ @Override public String toString() { - return "Delete LuceneWork: " + this.getEntityClass().getSimpleName() + "#" + this.getIdInString(); + return "DeleteLuceneWork: " + this.getEntityClass().getName() + "#" + this.getIdInString(); } + } Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/WorkQueue.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/WorkQueue.java 2010-03-29 15:26:12 UTC (rev 19129) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/WorkQueue.java 2010-03-29 22:35:23 UTC (rev 19130) @@ -55,12 +55,10 @@ this(10); } - public void add(Work work) { queue.add(work); } - public List<Work> getQueue() { return queue; } @@ -73,14 +71,6 @@ public List<LuceneWork> getSealedQueue() { if (sealedQueue == null) throw new AssertionFailure("Access a Sealed WorkQueue which has not been sealed"); - if (log.isTraceEnabled()) { - StringBuilder sb = new StringBuilder(); - for (LuceneWork lw : sealedQueue) { - sb.append( lw.toString() ); - sb.append( "\n" ); - } - log.trace( "sending sealedQueue to backend: \n" + sb.toString() ); - } return sealedQueue; } Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2010-03-29 15:26:12 UTC (rev 19129) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2010-03-29 22:35:23 UTC (rev 19130) @@ -275,13 +275,13 @@ public void performWorks(WorkQueue workQueue) { List<LuceneWork> sealedQueue = workQueue.getSealedQueue(); - if ( log.isDebugEnabled() ) { + if ( log.isTraceEnabled() ) { StringBuilder sb = new StringBuilder( "Lucene WorkQueue to send to backend: \n\t" ); for ( LuceneWork lw : sealedQueue ) { sb.append( lw.toString() ); sb.append( "\n\t" ); } - log.debug( sb.toString() ); + log.trace( sb.toString() ); } Runnable processor = backendQueueProcessorFactory.getProcessor( sealedQueue ); if ( sync ) {