Author: norman
Date: Sat Nov 27 09:40:37 2010
New Revision: 1039633
URL: http://svn.apache.org/viewvc?rev=1039633&view=rev
Log:
Use Hook interface in HookResultHook
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResultHook.java
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java?rev=1039633&r1=1039632&r2=1039633&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
Sat Nov 27 09:40:37 2010
@@ -37,7 +37,7 @@ import org.apache.james.protocols.smtp.h
* Abstract class which Handle hook-aware CommanHandler.
*
*/
-public abstract class AbstractHookableCmdHandler<Hook> implements
CommandHandler<SMTPSession>, ExtensibleHandler {
+public abstract class AbstractHookableCmdHandler<Hook extends
org.apache.james.protocols.smtp.hook.Hook> implements
CommandHandler<SMTPSession>, ExtensibleHandler {
private List<Hook> hooks;
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java?rev=1039633&r1=1039632&r2=1039633&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
Sat Nov 27 09:40:37 2010
@@ -102,9 +102,9 @@ public final class DataLineMessageHookHa
try {
int count = messageHandlers.size();
for(int i =0; i < count; i++) {
- Object rawHandler = messageHandlers.get(i);
+ MessageHook rawHandler = (MessageHook)
messageHandlers.get(i);
session.getLogger().debug("executing message handler " +
rawHandler);
- HookResult hRes =
((MessageHook)rawHandler).onMessage(session, mail);
+ HookResult hRes = rawHandler.onMessage(session, mail);
if (rHooks != null) {
for (int i2 = 0; i2 < rHooks.size(); i2++) {
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java?rev=1039633&r1=1039632&r2=1039633&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
Sat Nov 27 09:40:37 2010
@@ -334,7 +334,7 @@ public class AuthCmdHandler
Object rHook = rHooks.get(i2);
session.getLogger().debug("executing hook " + rHook);
- hRes = ((HookResultHook) rHook).onHookResult(session,
hRes, rHook);
+ hRes = ((HookResultHook) rHook).onHookResult(session,
hRes, rawHook);
}
}
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResultHook.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResultHook.java?rev=1039633&r1=1039632&r2=1039633&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResultHook.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResultHook.java
Sat Nov 27 09:40:37 2010
@@ -24,5 +24,5 @@ import org.apache.james.protocols.smtp.S
public interface HookResultHook {
- public HookResult onHookResult(SMTPSession session,HookResult result,
Object object);
+ public HookResult onHookResult(SMTPSession session,HookResult result, Hook
object);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
