Author: solomax
Date: Mon Jun 16 13:13:45 2014
New Revision: 1602861
URL: http://svn.apache.org/r1602861
Log:
"Access Denied" with "Remember Me" is fixed
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java?rev=1602861&r1=1602860&r2=1602861&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java
Mon Jun 16 13:13:45 2014
@@ -152,6 +152,9 @@ public class WebSession extends Abstract
} catch (Exception e) {
//no-op, will continue to sign-in page
}
+ if (rights.isEmpty()) {
+ isSignedIn();
+ }
Roles r = new Roles();
for (Right right : rights) {
r.add(right.name());
@@ -260,6 +263,9 @@ public class WebSession extends Abstract
default:
throw new OmException(-1L);
}
+ if (u == null) {
+ return false;
+ }
setUser(u);
return true;
} catch (OmException oe) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1602861&r1=1602860&r2=1602861&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
Mon Jun 16 13:13:45 2014
@@ -153,6 +153,9 @@ public class WebSession extends Abstract
} catch (Exception e) {
//no-op, will continue to sign-in page
}
+ if (rights.isEmpty()) {
+ isSignedIn();
+ }
Roles r = new Roles();
for (Right right : rights) {
r.add(right.name());
