This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new 451aeab6b ARIES-2244: Fix typo 'occured' to 'occurred' (#943)
451aeab6b is described below
commit 451aeab6b199b7d1156f82ce088330201ca57f2a
Author: Dominik Przybysz <[email protected]>
AuthorDate: Wed Nov 4 18:58:12 2026 +0100
ARIES-2244: Fix typo 'occured' to 'occurred' (#943)
---
.../src/main/java/org/apache/aries/jmx/framework/BundleState.java | 2 +-
.../java/org/apache/aries/jmx/framework/BundleStateMBeanHandler.java | 4 ++--
.../src/main/java/org/apache/aries/jmx/framework/ServiceState.java | 2 +-
samples/ariestrader/modules/ariestrader-web/src/main/webapp/error.jsp | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleState.java
b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleState.java
index 66dbc1f2b..10295e220 100644
--- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleState.java
+++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleState.java
@@ -425,7 +425,7 @@ public class BundleState extends
NotificationBroadcasterSupport implements Bundl
+ event + "] - Dispatcher may have been
shutdown");
} catch (Exception e) {
logger.log(LogService.LOG_WARNING,
- "Exception occured on JMX Notification
dispatch for event [" + event + "]", e);
+ "Exception occurred on JMX Notification
dispatch for event [" + event + "]", e);
}
}
};
diff --git
a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleStateMBeanHandler.java
b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleStateMBeanHandler.java
index 0ba252daa..5e2c9c9b6 100644
---
a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleStateMBeanHandler.java
+++
b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleStateMBeanHandler.java
@@ -104,7 +104,7 @@ public class BundleStateMBeanHandler implements
MBeanHandler {
try {
bundleContext.ungetService(packageAdminRef);
} catch (RuntimeException e) {
- logger.log(LogService.LOG_WARNING, "Exception occured during
cleanup", e);
+ logger.log(LogService.LOG_WARNING, "Exception occurred during
cleanup", e);
}
packageAdminRef = null;
}
@@ -112,7 +112,7 @@ public class BundleStateMBeanHandler implements
MBeanHandler {
try {
bundleContext.ungetService(startLevelRef);
} catch (RuntimeException e) {
- logger.log(LogService.LOG_WARNING, "Exception occured during
cleanup", e);
+ logger.log(LogService.LOG_WARNING, "Exception occurred during
cleanup", e);
}
startLevelRef = null;
}
diff --git
a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/ServiceState.java
b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/ServiceState.java
index 0c2cac628..beb4df6d5 100644
---
a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/ServiceState.java
+++
b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/ServiceState.java
@@ -278,7 +278,7 @@ public class ServiceState extends
NotificationBroadcasterSupport implements Serv
+ serviceevent + "] - Dispatcher may have
been shutdown");
} catch (Exception e) {
logger.log(LogService.LOG_WARNING,
- "Exception occured on JMX Notification
dispatch for event [" + serviceevent + "]",
+ "Exception occurred on JMX Notification
dispatch for event [" + serviceevent + "]",
e);
}
}
diff --git
a/samples/ariestrader/modules/ariestrader-web/src/main/webapp/error.jsp
b/samples/ariestrader/modules/ariestrader-web/src/main/webapp/error.jsp
index ec45bfda3..9e5b3e93c 100644
--- a/samples/ariestrader/modules/ariestrader-web/src/main/webapp/error.jsp
+++ b/samples/ariestrader/modules/ariestrader-web/src/main/webapp/error.jsp
@@ -40,7 +40,7 @@
</TR>
<TR>
<TD bgcolor="#e7e4e7" rowspan="4" width="3"></TD>
- <TD><B><FONT color="#000000">An Error has occured during
AriesTrader processing</FONT><FONT size="-2">.</FONT></B><BR>
+ <TD><B><FONT color="#000000">An Error has occurred during
AriesTrader processing</FONT><FONT size="-2">.</FONT></B><BR>
The stack trace detailing the error follows.
<p><b>Please consult the application server error logs for further
details.</b></p>
</TD>
