litesoft
Diff Revisions
953
vs
954
for /trunk/Java/GWT/Server/src/org/litesoft/security/AbstractCurrentSecurityUserAccessor.java
|
@@ -47,16 +47,11 @@ |
47 |
47 |
|
} |
48 |
48 |
|
|
49 |
49 |
|
protected Pair<PO, VO> getPair( String pDefaultUserLoginEmail ) { |
50 |
|
- |
synchronized ( this ) { |
51 |
|
- |
VO zView = ServerContext.get().getServerSession().getAttribute( mClassVO ); |
52 |
|
- |
if ( (zView != null) || (pDefaultUserLoginEmail == null) ) { |
53 |
|
- |
return new Pair<PO, VO>( mViewStale, zView, mPO ); |
54 |
|
- |
} |
55 |
|
- |
} |
56 |
|
- |
mUserDataProvider.loginDefaultUser( pDefaultUserLoginEmail ); |
57 |
|
- |
synchronized ( this ) { |
58 |
|
- |
VO zView = ServerContext.get().getServerSession().getAttribute( mClassVO ); |
59 |
|
- |
return new Pair<PO, VO>( mViewStale, zView, mPO ); |
|
50 |
+ |
VO zView = getCachedInstance(); |
|
51 |
+ |
if ( (zView == null) && (pDefaultUserLoginEmail != null) ) { |
|
52 |
+ |
mUserDataProvider.loginDefaultUser( pDefaultUserLoginEmail ); // Switch Users! |
|
53 |
+ |
zView = getCachedInstance(); |
60 |
54 |
|
} |
|
55 |
+ |
return createPair( zView ); |
61 |
56 |
|
} |
62 |
57 |
|
} |