This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 7c05b4864f Fix 'occured' -> 'occurred' typos in user-visible log
messages (#2545)
7c05b4864f is described below
commit 7c05b4864ffafca3a3a9cf6a2da819fb7925b212
Author: Sai Asish Y <[email protected]>
AuthorDate: Sat Apr 18 23:50:37 2026 -0700
Fix 'occured' -> 'occurred' typos in user-visible log messages (#2545)
- main/.../DefaultJDBCLock.java: three SEVERE-level log messages
emitted when a JDBC lock fails to obtain a connection, set up the
connection, or release a ResultSet.
- wrapper/.../Main.java: System.err message printed when the wrapper
fails to shut the OSGi framework down cleanly.
No functional changes.
Signed-off-by: Sai Asish Y <[email protected]>
---
main/src/main/java/org/apache/karaf/main/lock/DefaultJDBCLock.java | 6 +++---
.../main/java/org/apache/karaf/wrapper/internal/service/Main.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/main/src/main/java/org/apache/karaf/main/lock/DefaultJDBCLock.java
b/main/src/main/java/org/apache/karaf/main/lock/DefaultJDBCLock.java
index adbd17d426..d5d16c6037 100644
--- a/main/src/main/java/org/apache/karaf/main/lock/DefaultJDBCLock.java
+++ b/main/src/main/java/org/apache/karaf/main/lock/DefaultJDBCLock.java
@@ -91,7 +91,7 @@ public class DefaultJDBCLock implements Lock {
createDatabase();
createSchema();
} catch (Exception e) {
- LOG.log(Level.SEVERE, "Error occured while attempting to obtain
connection", e);
+ LOG.log(Level.SEVERE, "Error occurred while attempting to obtain
connection", e);
}
}
@@ -298,7 +298,7 @@ public class DefaultJDBCLock implements Lock {
try {
rs.close();
} catch (SQLException e) {
- LOG.log(Level.SEVERE, "Error occured while releasing
ResultSet", e);
+ LOG.log(Level.SEVERE, "Error occurred while releasing
ResultSet", e);
}
}
}
@@ -333,7 +333,7 @@ public class DefaultJDBCLock implements Lock {
try {
return doCreateConnection(driver, url, username, password);
} catch (Exception e) {
- LOG.log(Level.SEVERE, "Error occured while setting up JDBC
connection", e);
+ LOG.log(Level.SEVERE, "Error occurred while setting up JDBC
connection", e);
throw e;
}
}
diff --git
a/wrapper/src/main/java/org/apache/karaf/wrapper/internal/service/Main.java
b/wrapper/src/main/java/org/apache/karaf/wrapper/internal/service/Main.java
index 49e1fd63a6..76de50285a 100644
--- a/wrapper/src/main/java/org/apache/karaf/wrapper/internal/service/Main.java
+++ b/wrapper/src/main/java/org/apache/karaf/wrapper/internal/service/Main.java
@@ -97,7 +97,7 @@ public class Main extends Thread implements WrapperListener,
ShutdownCallback {
return -3;
}
} catch (Throwable ex) {
- System.err.println("Error occured shutting down framework: " + ex);
+ System.err.println("Error occurred shutting down framework: " +
ex);
ex.printStackTrace();
return -2;
}