From 65ac38868a1b09d0dce5ce12a95bcecef7cb8178 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Wed, 11 Dec 2024 21:21:22 +0100 Subject: [PATCH] Fix spelling of occurred. --- .../felix/configurator/impl/ServicesListener.java | 2 +- .../org/apache/felix/dm/itest/api/AspectRaceTest.java | 2 +- .../org/apache/felix/dm/itest/api/ServiceRaceTest.java | 2 +- .../dm/itest/api/ServiceRaceWithOrderedUnbindTest.java | 2 +- .../felix/gogo/jline/telnet/ConnectionListener.java | 10 +++++----- .../ipojo/composite/instance/InstanceHandler.java | 2 +- log/src/main/java/org/apache/felix/log/Activator.java | 2 +- .../apache/felix/log/ConfigurationListenerImpl.java | 4 ++-- log/src/main/java/org/apache/felix/log/Log.java | 6 +++--- .../java/org/apache/felix/utils/json/JSONParser.java | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/configurator/src/main/java/org/apache/felix/configurator/impl/ServicesListener.java b/configurator/src/main/java/org/apache/felix/configurator/impl/ServicesListener.java index 1b82f4fa92..11ee4e4786 100644 --- a/configurator/src/main/java/org/apache/felix/configurator/impl/ServicesListener.java +++ b/configurator/src/main/java/org/apache/felix/configurator/impl/ServicesListener.java @@ -171,7 +171,7 @@ public void start() { + Constants.OBJECTCLASS + "=" + serviceName + ")"); } catch (final InvalidSyntaxException ise) { // this should really never happen - throw new RuntimeException("Unexpected exception occured.", ise); + throw new RuntimeException("Unexpected exception occurred.", ise); } this.retainService(); } diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceTest.java index df4f4e5228..c66e6dde94 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceTest.java +++ b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceTest.java @@ -92,7 +92,7 @@ public void testConcurrentAspects() { } if (super.errorsLogged()) { - throw new IllegalStateException("Race test interrupted (some error occured, see previous logs)"); + throw new IllegalStateException("Race test interrupted (some error occurred, see previous logs)"); } } } diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java index 4bad0e32be..d9edea0ab4 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java +++ b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java @@ -227,7 +227,7 @@ public void run() { m_threadPool.awaitQuiescence(5000, TimeUnit.MILLISECONDS); if (super.errorsLogged()) { - throw new IllegalStateException("Race test interrupted (some error occured, see previous logs)"); + throw new IllegalStateException("Race test interrupted (some error occurred, see previous logs)"); } debug("finished one test loop"); diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceWithOrderedUnbindTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceWithOrderedUnbindTest.java index 5c03d85261..dc460a53f6 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceWithOrderedUnbindTest.java +++ b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceWithOrderedUnbindTest.java @@ -206,7 +206,7 @@ void doTest(int loop) throws Throwable { } if (super.errorsLogged()) { - throw new IllegalStateException("Race test interrupted (some error occured, see previous logs)"); + throw new IllegalStateException("Race test interrupted (some error occurred, see previous logs)"); } debug("finished one test loop"); diff --git a/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionListener.java b/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionListener.java index 38ed90bbe8..01440ca91e 100644 --- a/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionListener.java +++ b/gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionListener.java @@ -64,7 +64,7 @@ public interface ConnectionListener { /** - * Called when a CONNECTION_IDLE event occured. + * Called when a CONNECTION_IDLE event occurred. * * @param ce ConnectionEvent instance. * @see ConnectionEvent.Type#CONNECTION_IDLE @@ -72,7 +72,7 @@ public interface ConnectionListener { void connectionIdle(ConnectionEvent ce); /** - * Called when a CONNECTION_TIMEDOUT event occured. + * Called when a CONNECTION_TIMEDOUT event occurred. * * @param ce ConnectionEvent instance. * @see ConnectionEvent.Type#CONNECTION_TIMEDOUT @@ -80,7 +80,7 @@ public interface ConnectionListener { void connectionTimedOut(ConnectionEvent ce); /** - * Called when a CONNECTION_LOGOUTREQUEST occured. + * Called when a CONNECTION_LOGOUTREQUEST occurred. * * @param ce ConnectionEvent instance. * @see ConnectionEvent.Type#CONNECTION_LOGOUTREQUEST @@ -88,7 +88,7 @@ public interface ConnectionListener { void connectionLogoutRequest(ConnectionEvent ce); /** - * Called when a CONNECTION_BREAK event occured. + * Called when a CONNECTION_BREAK event occurred. * * @param ce ConnectionEvent instance. * @see ConnectionEvent.Type#CONNECTION_BREAK @@ -96,7 +96,7 @@ public interface ConnectionListener { void connectionSentBreak(ConnectionEvent ce); /** - * Called when a CONNECTION_TERMINAL_GEOMETRY_CHANGED event occured. + * Called when a CONNECTION_TERMINAL_GEOMETRY_CHANGED event occurred. * * @param ce ConnectionEvent instance. * @see ConnectionEvent.Type#CONNECTION_TERMINAL_GEOMETRY_CHANGED diff --git a/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java index 20b2a7b356..47c3cbc9cc 100644 --- a/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java +++ b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java @@ -165,7 +165,7 @@ private void createInstance(Factory fact, ManagedConfiguration config) { } catch (MissingHandlerException e) { error("The instance creation has failed, at least one handler is missing", e); } catch (ConfigurationException e) { - error("The instance creation has failed, an error during the configuration has occured", e); + error("The instance creation has failed, an error during the configuration has occurred", e); } } diff --git a/log/src/main/java/org/apache/felix/log/Activator.java b/log/src/main/java/org/apache/felix/log/Activator.java index 78c5bb014b..b1c0a50033 100644 --- a/log/src/main/java/org/apache/felix/log/Activator.java +++ b/log/src/main/java/org/apache/felix/log/Activator.java @@ -159,7 +159,7 @@ public void start(final BundleContext context) throws Exception try { m_configurationListener = new ConfigurationListenerImpl(context, m_log, m_loggerAdmin); } catch (Exception e) { - m_log.log(getClass().getName(), context.getBundle(), null, LogLevel.ERROR, "An error occured while setting up the configuration listener.", e); + m_log.log(getClass().getName(), context.getBundle(), null, LogLevel.ERROR, "An error occurred while setting up the configuration listener.", e); } } diff --git a/log/src/main/java/org/apache/felix/log/ConfigurationListenerImpl.java b/log/src/main/java/org/apache/felix/log/ConfigurationListenerImpl.java index 2f7dc865e0..489cc74145 100644 --- a/log/src/main/java/org/apache/felix/log/ConfigurationListenerImpl.java +++ b/log/src/main/java/org/apache/felix/log/ConfigurationListenerImpl.java @@ -188,10 +188,10 @@ private List listConfigurations(String filter) { } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { if (e instanceof InvocationTargetException) { - m_log.log(getClass().getName(), m_context.getBundle(), null, LogLevel.ERROR, "An error occured reflecting on ConfigurationAdmin.", ((InvocationTargetException)e).getTargetException()); + m_log.log(getClass().getName(), m_context.getBundle(), null, LogLevel.ERROR, "An error occurred reflecting on ConfigurationAdmin.", ((InvocationTargetException)e).getTargetException()); } else { - m_log.log(getClass().getName(), m_context.getBundle(), null, LogLevel.ERROR, "An error occured reflecting on ConfigurationAdmin.", e); + m_log.log(getClass().getName(), m_context.getBundle(), null, LogLevel.ERROR, "An error occurred reflecting on ConfigurationAdmin.", e); } } return Collections.emptyList(); diff --git a/log/src/main/java/org/apache/felix/log/Log.java b/log/src/main/java/org/apache/felix/log/Log.java index 8e2b59bae2..a92f596f7c 100644 --- a/log/src/main/java/org/apache/felix/log/Log.java +++ b/log/src/main/java/org/apache/felix/log/Log.java @@ -213,7 +213,7 @@ synchronized Enumeration getEntries() /** * Called when a framework event occurs. - * @param event the event that occured + * @param event the event that occurred */ @Override public void frameworkEvent(final FrameworkEvent event) @@ -255,7 +255,7 @@ public void frameworkEvent(final FrameworkEvent event) /** * Called when a bundle event occurs. - * @param event the event that occured + * @param event the event that occurred */ @Override public void bundleChanged(final BundleEvent event) @@ -306,7 +306,7 @@ public static StackTraceElement getStackTraceElement() { /** * Called when a service event occurs. - * @param event the event that occured + * @param event the event that occurred */ @Override public void serviceChanged(final ServiceEvent event) diff --git a/utils/src/main/java/org/apache/felix/utils/json/JSONParser.java b/utils/src/main/java/org/apache/felix/utils/json/JSONParser.java index 43102cfc85..012f7bc5df 100644 --- a/utils/src/main/java/org/apache/felix/utils/json/JSONParser.java +++ b/utils/src/main/java/org/apache/felix/utils/json/JSONParser.java @@ -204,7 +204,7 @@ private static Object parseObject(String jsonObject) { values.put(pair.key, pair.value); lastParsedObject = jsonObject; } catch (Throwable t) { - throw new IllegalArgumentException("An error occured after: " + lastParsedObject, t); + throw new IllegalArgumentException("An error occurred after: " + lastParsedObject, t); } }