Hibernate SVN: r16219 - validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report.
by hibernate-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-03-25 23:28:04 -0400 (Wed, 25 Mar 2009)
New Revision: 16219
Modified:
validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/CoverageReport.java
Log:
escape assertion text
Modified: validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/CoverageReport.java
===================================================================
--- validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/CoverageReport.java 2009-03-25 21:49:56 UTC (rev 16218)
+++ validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/CoverageReport.java 2009-03-26 03:28:04 UTC (rev 16219)
@@ -646,7 +646,7 @@
copyFile(imageFile, new File(imageTargetDir, imageFilename));
}
- String assertionText = parseStrikethrough(parseBold(parseLiteral(assertion.getText())));
+ String assertionText = parseStrikethrough(parseBold(parseLiteral(escape(assertion.getText()))));
if (!Strings.isEmpty(assertion.getNote()))
{
15 years, 9 months
Hibernate SVN: r16218 - search/trunk/src/main/java/org/hibernate/search/filter.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2009-03-25 17:49:56 -0400 (Wed, 25 Mar 2009)
New Revision: 16218
Modified:
search/trunk/src/main/java/org/hibernate/search/filter/FilterOptimizationHelper.java
Log:
HSEARCH-355 avoid method overloading
Modified: search/trunk/src/main/java/org/hibernate/search/filter/FilterOptimizationHelper.java
===================================================================
--- search/trunk/src/main/java/org/hibernate/search/filter/FilterOptimizationHelper.java 2009-03-25 21:07:29 UTC (rev 16217)
+++ search/trunk/src/main/java/org/hibernate/search/filter/FilterOptimizationHelper.java 2009-03-25 21:49:56 UTC (rev 16218)
@@ -44,10 +44,10 @@
return docIdSets;
}
if ( openBitSets.size() > 0 ) {
- nonMergeAble.add( mergeByBitAnds( openBitSets ) );
+ nonMergeAble.add( mergeByBitAndsForOpenBitSet( openBitSets ) );
}
if ( docIdBitSets.size() > 0 ) {
- nonMergeAble.add( mergeByBitAnds( docIdBitSets ) );
+ nonMergeAble.add( mergeByBitAndsForDocIdBitSet( docIdBitSets ) );
}
return nonMergeAble;
}
@@ -60,7 +60,7 @@
* @return a new DocIdBitSet, or the first element if only
* one element was found in the list.
*/
- public static DocIdBitSet mergeByBitAnds(List<DocIdBitSet> docIdBitSets) {
+ private static DocIdBitSet mergeByBitAndsForDocIdBitSet(List<DocIdBitSet> docIdBitSets) {
int listSize = docIdBitSets.size();
if ( listSize == 1 ) {
return docIdBitSets.get( 0 );
@@ -82,7 +82,7 @@
* @return a new OpenBitSet, or the first element if only
* one element was found in the list.
*/
- public static OpenBitSet mergeByBitAnds(List<OpenBitSet> openBitSets) {
+ private static OpenBitSet mergeByBitAndsForOpenBitSet(List<OpenBitSet> openBitSets) {
int listSize = openBitSets.size();
if ( listSize == 1 ) {
return openBitSets.get( 0 );
15 years, 9 months
Hibernate SVN: r16217 - core/trunk/entitymanager/src/main/java/org/hibernate/ejb.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2009-03-25 17:07:29 -0400 (Wed, 25 Mar 2009)
New Revision: 16217
Modified:
core/trunk/entitymanager/src/main/java/org/hibernate/ejb/EntityManagerImpl.java
Log:
cleaner variable name
Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/EntityManagerImpl.java
===================================================================
--- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/EntityManagerImpl.java 2009-03-25 14:58:16 UTC (rev 16216)
+++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/EntityManagerImpl.java 2009-03-25 21:07:29 UTC (rev 16217)
@@ -38,23 +38,23 @@
this.sessionFactory = sessionFactory;
this.open = true;
this.discardOnClose = discardOnClose;
- Object localSic = null;
- if (properties != null) localSic = properties.get( HibernatePersistence.SESSION_INTERCEPTOR );
- if ( localSic != null ) {
- if (localSic instanceof Class) {
- sessionInterceptorClass = (Class) localSic;
+ Object localSessionInterceptor = null;
+ if (properties != null) localSessionInterceptor = properties.get( HibernatePersistence.SESSION_INTERCEPTOR );
+ if ( localSessionInterceptor != null ) {
+ if (localSessionInterceptor instanceof Class) {
+ sessionInterceptorClass = (Class) localSessionInterceptor;
}
- else if (localSic instanceof String) {
+ else if (localSessionInterceptor instanceof String) {
try {
sessionInterceptorClass =
- ReflectHelper.classForName( (String) localSic, EntityManagerImpl.class );
+ ReflectHelper.classForName( (String) localSessionInterceptor, EntityManagerImpl.class );
}
catch (ClassNotFoundException e) {
- throw new PersistenceException("Unable to instanciate interceptor: " + localSic, e);
+ throw new PersistenceException("Unable to instanciate interceptor: " + localSessionInterceptor, e);
}
}
else {
- throw new PersistenceException("Unable to instanciate interceptor: " + localSic);
+ throw new PersistenceException("Unable to instanciate interceptor: " + localSessionInterceptor);
}
}
this.sessionInterceptorClass = sessionInterceptorClass;
15 years, 9 months