diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java index 318fbf836e..17cd1933d6 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java @@ -299,7 +299,7 @@ public interface CoreMessageLogger extends BasicLogger { void factoryUnboundFromName(String name); @LogMessage(level = ERROR) - @Message(value = "an assertion failure occured" + " (this may indicate a bug in Hibernate, but is more likely due" + @Message(value = "an assertion failure occurred" + " (this may indicate a bug in Hibernate, but is more likely due" + " to unsafe use of the session): %s", id = 99) void failed(Throwable throwable); diff --git a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java index ebee65b933..89f43ecfb0 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java @@ -455,9 +455,9 @@ public class SchemaExport { } /** - * Returns a List of all Exceptions which occured during the export. + * Returns a List of all Exceptions which occurred during the export. * - * @return A List containing the Exceptions occured during the export + * @return A List containing the Exceptions occurred during the export */ public List getExceptions() { return exceptions; diff --git a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java index 85bfc9ccd9..87884b8793 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java @@ -92,9 +92,9 @@ public class SchemaUpdate { } /** - * Returns a List of all Exceptions which occured during the export. + * Returns a List of all Exceptions which occurred during the export. * - * @return A List containing the Exceptions occured during the export + * @return A List containing the Exceptions occurred during the export */ public List getExceptions() { return exceptions; diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java index 40d72ececf..77fc9c5c3b 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java @@ -404,7 +404,7 @@ public class PutFromLoadValidator { * released the lock. This allows the caller to be certain the putFromLoad will not execute afterQuery this method returns, * possibly caching stale data.
* - * @returntrue
if the invalidation was successful; false
if a problem occured (which the
+ * @return true
if the invalidation was successful; false
if a problem occurred (which the
* caller should treat as an exception condition)
*/
public boolean beginInvalidatingRegion() {
@@ -539,7 +539,7 @@ public class PutFromLoadValidator {
*
* @param key key identifying data whose pending puts should be invalidated
*
- * @return true
if the invalidation was successful; false
if a problem occured (which the
+ * @return true
if the invalidation was successful; false
if a problem occurred (which the
* caller should treat as an exception condition)
*/
public boolean beginInvalidatingKey(Object lockOwner, Object key) {
diff --git a/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/ProxoolMessageLogger.java b/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/ProxoolMessageLogger.java
index 1f47a5ea9e..f145863994 100644
--- a/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/ProxoolMessageLogger.java
+++ b/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/ProxoolMessageLogger.java
@@ -66,7 +66,7 @@ public interface ProxoolMessageLogger extends ConnectionPoolingLogger {
*
* @return The message
*/
- @Message(value = "Exception occured when closing the Proxool pool", id = 30006)
+ @Message(value = "Exception occurred when closing the Proxool pool", id = 30006)
String exceptionClosingProxoolPool();
/**