Author: norman Date: Sat Jan 7 14:23:57 2012 New Revision: 1228620 URL: http://svn.apache.org/viewvc?rev=1228620&view=rev Log: Fix class-cast exception which was introduced by JAMES-1360
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/JamesPassCmdHandler.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java?rev=1228620&r1=1228619&r2=1228620&view=diff ============================================================================== --- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java (original) +++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java Sat Jan 7 14:23:57 2012 @@ -59,7 +59,7 @@ public class CoreCmdHandlerLoader implem private final static String COMMANDDISPATCHER = CommandDispatcher.class.getName(); // logging stuff - private final String COMMANDHANDLERRESULTLOGGER = POP3CommandHandlerResultLogger.class.getName(); + private final static String COMMANDHANDLERRESULTLOGGER = POP3CommandHandlerResultLogger.class.getName(); private final List<String> commands = new LinkedList<String>(); Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/JamesPassCmdHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/JamesPassCmdHandler.java?rev=1228620&r1=1228619&r2=1228620&view=diff ============================================================================== --- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/JamesPassCmdHandler.java (original) +++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/JamesPassCmdHandler.java Sat Jan 7 14:23:57 2012 @@ -50,7 +50,7 @@ public class JamesPassCmdHandler impleme public Response onCommand(POP3Session session, Request request) { Response response = handler.onCommand(session, request); if (POP3Response.OK_RESPONSE.equals(response.getRetCode())) { - POP3BeforeSMTPHelper.addIPAddress(session.getRemoteAddress().getAddress().toString()); + POP3BeforeSMTPHelper.addIPAddress(session.getRemoteAddress().getAddress().getHostAddress()); } return response; } Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java?rev=1228620&r1=1228619&r2=1228620&view=diff ============================================================================== --- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java (original) +++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java Sat Jan 7 14:23:57 2012 @@ -25,19 +25,18 @@ import org.apache.james.protocols.api.ha import org.apache.james.protocols.api.handler.LifecycleAwareProtocolHandler; import org.apache.james.protocols.lib.jmx.AbstractCommandHandlerResultJMXMonitor; import org.apache.james.protocols.lib.jmx.AbstractCommandHandlerStats; -import org.apache.james.protocols.pop3.POP3Response; import org.apache.james.protocols.pop3.POP3Session; /** * Gather JMX stats for {@link CommandHandler} */ -public class CommandHandlerResultJMXMonitor extends AbstractCommandHandlerResultJMXMonitor<POP3Response, POP3Session> implements LifecycleAwareProtocolHandler { +public class CommandHandlerResultJMXMonitor extends AbstractCommandHandlerResultJMXMonitor<POP3Session> implements LifecycleAwareProtocolHandler { /** * @see org.apache.james.protocols.lib.jmx.AbstractCommandHandlerResultJMXMonitor * #createCommandHandlerStats(org.apache.james.protocols.api.CommandHandler) */ - protected AbstractCommandHandlerStats<POP3Response> createCommandHandlerStats(CommandHandler<POP3Session> handler) throws Exception { + protected AbstractCommandHandlerStats createCommandHandlerStats(CommandHandler<POP3Session> handler) throws Exception { Collection<String> col = handler.getImplCommands(); String cName = handler.getClass().getName(); Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java?rev=1228620&r1=1228619&r2=1228620&view=diff ============================================================================== --- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java (original) +++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java Sat Jan 7 14:23:57 2012 @@ -25,10 +25,11 @@ import javax.management.MBeanRegistratio import javax.management.MalformedObjectNameException; import javax.management.NotCompliantMBeanException; +import org.apache.james.protocols.api.Response; import org.apache.james.protocols.lib.jmx.AbstractCommandHandlerStats; import org.apache.james.protocols.pop3.POP3Response; -public class POP3CommandHandlerStats extends AbstractCommandHandlerStats<POP3Response> implements POP3CommandHandlerStatsMBean { +public class POP3CommandHandlerStats extends AbstractCommandHandlerStats implements POP3CommandHandlerStatsMBean { private AtomicLong error = new AtomicLong(0); private AtomicLong ok = new AtomicLong(0); @@ -42,7 +43,7 @@ public class POP3CommandHandlerStats ext * org.apache.james.protocols.lib.jmx.AbstractCommandHandlerStats * #increment(org.apache.james.protocols.api.Response) */ - protected void incrementStats(POP3Response response) { + protected void incrementStats(Response response) { String code = response.getRetCode(); if (POP3Response.OK_RESPONSE.equals(code)) { ok.incrementAndGet(); Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java?rev=1228620&r1=1228619&r2=1228620&view=diff ============================================================================== --- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java (original) +++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java Sat Jan 7 14:23:57 2012 @@ -38,9 +38,9 @@ import org.apache.james.protocols.lib.li /** * Expose JMX statistics for {@link CommandHandler} */ -public abstract class AbstractCommandHandlerResultJMXMonitor<R extends Response, S extends ProtocolSession> implements ProtocolHandlerResultHandler<R, S>, ExtensibleHandler, InitializingLifecycleAwareProtocolHandler { +public abstract class AbstractCommandHandlerResultJMXMonitor<S extends ProtocolSession> implements ProtocolHandlerResultHandler<Response, S>, ExtensibleHandler, InitializingLifecycleAwareProtocolHandler { - private Map<String, AbstractCommandHandlerStats<R>> cStats = new HashMap<String, AbstractCommandHandlerStats<R>>(); + private Map<String, AbstractCommandHandlerStats> cStats = new HashMap<String, AbstractCommandHandlerStats>(); private String jmxName; /** @@ -50,10 +50,10 @@ public abstract class AbstractCommandHan * org.apache.james.protocols.api.Response, long, * org.apache.james.protocols.api.handler.ProtocolHandler) */ - public Response onResponse(ProtocolSession session, R response, long executionTime, ProtocolHandler handler) { + public Response onResponse(ProtocolSession session, Response response, long executionTime, ProtocolHandler handler) { if (handler instanceof CommandHandler) { String name = handler.getClass().getName(); - AbstractCommandHandlerStats<R> stats = cStats.get(name); + AbstractCommandHandlerStats stats = cStats.get(name); if (stats != null) { stats.increment(response); } @@ -101,7 +101,7 @@ public abstract class AbstractCommandHan * @return stats * @throws Exception */ - protected abstract AbstractCommandHandlerStats<R> createCommandHandlerStats(CommandHandler<S> handler) throws Exception; + protected abstract AbstractCommandHandlerStats createCommandHandlerStats(CommandHandler<S> handler) throws Exception; @Override @@ -117,7 +117,7 @@ public abstract class AbstractCommandHan @Override public void destroy() { - Iterator<AbstractCommandHandlerStats<R>> it = cStats.values().iterator(); + Iterator<AbstractCommandHandlerStats> it = cStats.values().iterator(); while(it.hasNext()) { it.next().dispose(); } Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java?rev=1228620&r1=1228619&r2=1228620&view=diff ============================================================================== --- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java (original) +++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java Sat Jan 7 14:23:57 2012 @@ -36,7 +36,7 @@ import org.apache.james.protocols.api.ha /** * Expose statistics for {@link CommandHandler} via JMX */ -public abstract class AbstractCommandHandlerStats<R extends Response> extends StandardMBean implements CommandHandlerStatsMBean, Disposable { +public abstract class AbstractCommandHandlerStats extends StandardMBean implements CommandHandlerStatsMBean, Disposable { private AtomicLong all = new AtomicLong(0); private AtomicLong disconnect = new AtomicLong(); @@ -62,7 +62,7 @@ public abstract class AbstractCommandHan * * @param response */ - public void increment(R response) { + public void increment(Response response) { if (response.isEndSession()) { disconnect.incrementAndGet(); } @@ -76,7 +76,7 @@ public abstract class AbstractCommandHan * * @param response */ - protected abstract void incrementStats(R response); + protected abstract void incrementStats(Response response); /** * @see org.apache.james.protocols.lib.jmx.CommandHandlerStatsMBean#getAll() --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org