litesoft
Diff Revisions
952
vs
953
for /trunk/Java/DATT/src/org/litesoft/datt/server/boviews/podataproviders/UserViewPoServerVoDataProvider.java
|
@@ -63,7 +63,7 @@ |
63 |
63 |
|
if ( zRestrictedResource == null ) { |
64 |
64 |
|
throw new DisplayableRuntimeException( "RestrictedResourceNotFound", pRestrictedResourceView.toString() ); |
65 |
65 |
|
} |
66 |
|
- |
UserRestrictedResourcePair<User, RestrictedResource> zPair = zUser.loginToRestrictedResourceIfAcceptable( zRestrictedResource ); |
|
66 |
+ |
UserRestrictedResourcePair zPair = zUser.loginToRestrictedResourceIfAcceptable( zRestrictedResource ); |
67 |
67 |
|
return finiUserLogin( zPair.getUser(), zPair.getRestrictedResource() ); |
68 |
68 |
|
} |
69 |
69 |
|
|
|
@@ -74,8 +74,8 @@ |
74 |
74 |
|
|
75 |
75 |
|
protected SecurityUserView finiUserLogin( SecurityUser<User> pUser, SecurityRestrictedResource<RestrictedResource> pRestrictedResource ) { |
76 |
76 |
|
UserRestrictedResourcePair zUserRestrictedResourcePair = ((User) pUser).getLoginRestrictedResource( (RestrictedResource) pRestrictedResource ); |
77 |
|
- |
User zUser = (User) zUserRestrictedResourcePair.getUser(); |
78 |
|
- |
RestrictedResource zRestrictedResource = (RestrictedResource) zUserRestrictedResourcePair.getRestrictedResource(); |
|
77 |
+ |
User zUser = zUserRestrictedResourcePair.getUser(); |
|
78 |
+ |
RestrictedResource zRestrictedResource = zUserRestrictedResourcePair.getRestrictedResource(); |
79 |
79 |
|
CurrentRestrictedResourceAccessor zRestrictedResourceAccessor = CurrentRestrictedResourceAccessor.get(); |
80 |
80 |
|
zRestrictedResourceAccessor.updateRestrictedResource( zRestrictedResource ); |
81 |
81 |
|
if ( !zRestrictedResource.equals( zUser.getLastRestrictedResource() ) ) { |