Author: dongxu
Date: Thu Sep 12 03:38:00 2013
New Revision: 1522226
URL: http://svn.apache.org/r1522226
Log:
fix the bug that there will throw a NullPointerException after the first time
into the message view page and then click the back link given not click the
folders names
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java?rev=1522226&r1=1522225&r2=1522226&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
Thu Sep 12 03:38:00 2013
@@ -274,6 +274,7 @@ import org.apache.hupa.client.place.Mess
import org.apache.hupa.client.rf.GetMessageDetailsRequest;
import org.apache.hupa.client.ui.WidgetDisplayable;
import org.apache.hupa.client.widgets.IMAPTreeItem;
+import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
import org.apache.hupa.shared.domain.GetMessageDetailsAction;
import org.apache.hupa.shared.domain.GetMessageDetailsResult;
@@ -599,6 +600,7 @@ public class WestActivity extends AppBas
public WestActivity with(MailFolderPlace place) {
this.currentPlace = place;
this.user = place.getUser();
+ this.folder = new
ImapFolderImpl(user.getSettings().getInboxFolderName());
return this;
}
Modified: james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties?rev=1522226&r1=1522225&r2=1522226&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties
(original)
+++ james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties Thu
Sep 12 03:38:00 2013
@@ -17,15 +17,21 @@
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> fix the bug that there will throw a NullPointerException after the
first time into the message view page and then click the back link given not
click the folders names
# The demo mode should make two lines different
# 1. IMAPServerAddress=hupa.demo
# 2. DefaultInboxFolder=Mock-Inbox
# and then use the credential: demo/demo to login to the webmail through the
browser
+<<<<<<< HEAD
=======
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+>>>>>>> fix the bug that there will throw a NullPointerException after the
first time into the message view page and then click the back link given not
click the folders names
# The IP or domainname of the IMAP server
IMAPServerAddress=imap.gmail.com
# The port of the IMAP server
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
