Author: trustin
Date: Tue Jan 23 22:27:52 2007
New Revision: 499278
URL: http://svn.apache.org/viewvc?view=rev&rev=499278
Log:
Resolved issue: DIRMINA-337 (SwingChatClient example throws NPE)
* Applied Maarten's patch
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java
mina/trunk/example/src/main/java/org/apache/mina/example/chat/serverContext.xml
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java?view=diff&rev=499278&r1=499277&r2=499278
==============================================================================
---
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
(original)
+++
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
Tue Jan 23 22:27:52 2007
@@ -78,6 +78,7 @@
return false;
}
session = future1.getSession();
+ login();
return true;
}
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java?view=diff&rev=499278&r1=499277&r2=499278
==============================================================================
---
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java
(original)
+++
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java
Tue Jan 23 22:27:52 2007
@@ -280,7 +280,7 @@
public void connected()
{
- client.login();
+ //client.login();
}
public void disconnected()
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/chat/serverContext.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/serverContext.xml?view=diff&rev=499278&r1=499277&r2=499278
==============================================================================
---
mina/trunk/example/src/main/java/org/apache/mina/example/chat/serverContext.xml
(original)
+++
mina/trunk/example/src/main/java/org/apache/mina/example/chat/serverContext.xml
Tue Jan 23 22:27:52 2007
@@ -39,6 +39,7 @@
<bean id="filterChainBuilder"
class="org.apache.mina.integration.spring.DefaultIoFilterChainBuilderFactoryBean">
<property name="filters">
<list>
+ <bean class="org.apache.mina.filter.executor.ExecutorFilter"/>
<bean class="org.apache.mina.filter.codec.ProtocolCodecFilter">
<constructor-arg>
<bean
class="org.apache.mina.filter.codec.textline.TextLineCodecFactory" />
@@ -53,6 +54,7 @@
<bean id="sslFilterChainBuilder"
class="org.apache.mina.integration.spring.DefaultIoFilterChainBuilderFactoryBean">
<property name="filters">
<list>
+ <bean class="org.apache.mina.filter.executor.ExecutorFilter"/>
<bean class="org.apache.mina.filter.SSLFilter">
<constructor-arg ref="sslContext"/>
</bean>