Author: norman
Date: Mon Aug 24 07:29:33 2009
New Revision: 807108
URL: http://svn.apache.org/viewvc?rev=807108&view=rev
Log:
Fix NPE
Check if user exists in session
Modified:
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPFolderPresenter.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
labs/hupa/src/main/java/org/apache/hupa/server/handler/LoginSessionHandler.java
Modified:
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPFolderPresenter.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPFolderPresenter.java?rev=807108&r1=807107&r2=807108&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPFolderPresenter.java
(original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPFolderPresenter.java
Mon Aug 24 07:29:33 2009
@@ -195,7 +195,7 @@
registerHandler(eventBus.addHandler(ExpandMessageEvent.TYPE,
new ExpandMessageEventHandler() {
public void onExpandMessage(ExpandMessageEvent event) {
- if (editableTreeItem.isEdit()) {
+ if (editableTreeItem != null &&
editableTreeItem.isEdit()) {
editableTreeItem.cancelEdit();
}
}
Modified: labs/hupa/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java?rev=807108&r1=807107&r2=807108&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
(original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java Mon
Aug 24 07:29:33 2009
@@ -61,6 +61,7 @@
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.HasClickHandlers;
+import com.google.gwt.user.client.Cookies;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.Window.ClosingEvent;
import com.google.gwt.user.client.Window.ClosingHandler;
@@ -113,6 +114,8 @@
}
public void onSuccess(LogoutUserResult result) {
+ Cookies.removeCookie("sessionId");
+
eventBus.fireEvent(new
LogoutEvent(result.getUser()));
}
Modified:
labs/hupa/src/main/java/org/apache/hupa/server/handler/LoginSessionHandler.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/handler/LoginSessionHandler.java?rev=807108&r1=807107&r2=807108&view=diff
==============================================================================
---
labs/hupa/src/main/java/org/apache/hupa/server/handler/LoginSessionHandler.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/server/handler/LoginSessionHandler.java
Mon Aug 24 07:29:33 2009
@@ -60,10 +60,15 @@
if (action.getSessionId().equals(session.getId())) {
// get the stored user and return it
User user =
(User)sessionProvider.get().getAttribute("user");
- return new LoginUserResult(user);
+ if (user != null) {
+ return new LoginUserResult(user);
+ } else {
+ logger.info("No user was stored in session with
id " + action.getSessionId());
+ throw new ActionException("No user was stored
in session with id " + action.getSessionId());
+ }
} else {
logger.error("Sessin id " + action.getSessionId() + "
is not valid anymore");
- throw new ActionException("No user stored with the
session " + action.getSessionId());
+ throw new ActionException("Session id " +
action.getSessionId() + " is not valid anymore");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
