Skip to content

Commit

Permalink
Fix spelling of occurred.
Browse files Browse the repository at this point in the history
  • Loading branch information
wilx authored and stbischof committed Dec 11, 2024
1 parent 6d39e20 commit 65ac388
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)");
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,39 +64,39 @@
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
*/
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
*/
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
*/
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
*/
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion log/src/main/java/org/apache/felix/log/Activator.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,10 @@ private List<Dictionary> 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();
Expand Down
6 changes: 3 additions & 3 deletions log/src/main/java/org/apache/felix/log/Log.java
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ synchronized Enumeration<LogEntry> 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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down

0 comments on commit 65ac388

Please sign in to comment.