2:11 p.m.
Author: steve.ebersole(a)jboss.com
Date: 2010-08-26 15:11:48 -0400 (Thu, 26 Aug 2010)
New Revision: 20269
Modified:
core/trunk/core/src/main/java/org/hibernate/dialect/Dialect.java
core/trunk/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/lock/JPALockTest.java
core/trunk/testsuite/src/test/java/org/hibernate/test/optlock/OptimisticLockTest.java
Log:
HHH-5335 - a few typo fixes in Dialect and in tests
Modified: core/trunk/core/src/main/java/org/hibernate/dialect/Dialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/Dialect.java 2010-08-26 18:53:07
UTC (rev 20268)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/Dialect.java 2010-08-26 19:11:48
UTC (rev 20269)
@@ -1798,7 +1798,7 @@
}
/**
- * Does the dialect support propogating changes to LOB
+ * Does the dialect support propagating changes to LOB
* values back to the database? Talking about mutating the
* internal value of the locator as opposed to supplying a new
* locator instance...
@@ -1820,7 +1820,7 @@
* databases which (1) are not part of the cruise control process
* or (2) do not {@link #supportsExpectedLobUsagePattern}.
*
- * @return True if the changes are propogated back to the
+ * @return True if the changes are propagated back to the
* database; false otherwise.
* @since 3.2
*/
Modified: core/trunk/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java 2010-08-26
18:53:07 UTC (rev 20268)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java 2010-08-26
19:11:48 UTC (rev 20269)
@@ -147,7 +147,7 @@
public boolean supportsCircularCascadeDeleteConstraints() {
// SQL Server (at least up through 2005) does not support defining
- // cascade delete constraints which can circel back to the mutating
+ // cascade delete constraints which can circle back to the mutating
// table
return false;
}
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/lock/JPALockTest.java
===================================================================
---
core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/lock/JPALockTest.java 2010-08-26
18:53:07 UTC (rev 20268)
+++
core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/lock/JPALockTest.java 2010-08-26
19:11:48 UTC (rev 20269)
@@ -156,7 +156,7 @@
myEntity = (MyEntity) s1.get( MyEntity.class, myEntity.getId() );
s1.lock( myEntity, LockMode.FORCE );
- assertTrue( "LockMode.FORCE on a unversioned entity should degrade nicely to
UPGRADE", true );
+ assertTrue( "LockMode.FORCE on a un-versioned entity should degrade nicely to
UPGRADE", true );
s1.lock( item, LockMode.FORCE );
assertEquals( "subsequent LockMode.FORCE did not no-op", initialVersion + 1,
item.getVersion() );
@@ -177,7 +177,7 @@
item2.setName( "updated" );
try {
t2.commit();
- fail( "optimisitc lock should have failed" );
+ fail( "optimistic lock should have failed" );
}
catch (Throwable ignore) {
// expected behavior
Modified:
core/trunk/testsuite/src/test/java/org/hibernate/test/optlock/OptimisticLockTest.java
===================================================================
---
core/trunk/testsuite/src/test/java/org/hibernate/test/optlock/OptimisticLockTest.java 2010-08-26
18:53:07 UTC (rev 20268)
+++
core/trunk/testsuite/src/test/java/org/hibernate/test/optlock/OptimisticLockTest.java 2010-08-26
19:11:48 UTC (rev 20269)
@@ -1,4 +1,26 @@
-//$Id: OptimisticLockTest.java 11303 2007-03-19 22:06:14Z steve.ebersole(a)jboss.com $
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
package org.hibernate.test.optlock;
import junit.framework.Test;
@@ -12,7 +34,7 @@
import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite;
/**
- * Tests relating to the optimisitc-lock mapping option.
+ * Tests relating to the optimistic-lock mapping option.
*
* @author Gavin King
* @author Steve Ebersole
@@ -76,7 +98,7 @@
otherSession.close();
try {
- doc.setSummary( "A machiavelian achievement of epic proportions" );
+ doc.setSummary( "A machiavellian achievement of epic proportions" );
mainSession.flush();
fail( "expecting opt lock failure" );
}
@@ -110,6 +132,7 @@
mainSession.close();
}
+ @SuppressWarnings({ "UnnecessaryBoxing" })
private void testDeleteOptimisticLockFailure(String entityName) {
if ( getDialect().doesRepeatableReadCauseReadersToBlockWriters() ) {
reportSkip( "deadlock", "delete optimistic locking" );
@@ -127,7 +150,7 @@
mainSession.flush();
doc.setSummary( "A modern classic" );
mainSession.flush();
- doc.getPubDate().setMonth( new Integer( 3 ) );
+ doc.getPubDate().setMonth( Integer.valueOf( 3 ) );
mainSession.flush();
mainSession.getTransaction().commit();
mainSession.close();