svn commit: r1445558 - in /syncope/trunk/console/src/main/java/org/apache/syncope/console: commons/HttpResourceStream.java pages/RoleSelectModalPage.java

[ilgrosso]

Author: ilgrosso
Date: Wed Feb 13 11:36:45 2013
New Revision: 1445558

URL: http://svn.apache.org/r1445558
Log:
Fixing broken stream handling in the console: location is not provided anymore

Modified:
    
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/HttpResourceStream.java
    
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleSelectModalPage.java

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/HttpResourceStream.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/HttpResourceStream.java?rev=1445558&r1=1445557&r2=1445558&view=diff
==============================================================================
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/HttpResourceStream.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/HttpResourceStream.java
 Wed Feb 13 11:36:45 2013
@@ -38,8 +38,6 @@ public class HttpResourceStream extends 
 
     private transient InputStream inputStream;
 
-    private String location;
-
     private String contentType;
 
     private String filename;
@@ -48,7 +46,6 @@ public class HttpResourceStream extends 
         Object entity = response.getEntity();
         if (response.getStatus() == HttpStatus.SC_OK && (entity instanceof 
InputStream)) {
             this.inputStream = (InputStream) entity;
-            this.location = response.getLocation().toString();
             this.contentType = 
response.getHeaderString(HttpHeaders.CONTENT_TYPE);
             String contentDisposition = 
response.getHeaderString(SyncopeConstants.CONTENT_DISPOSITION_HEADER);
             if (StringUtils.isNotBlank(contentDisposition)) {
@@ -83,7 +80,7 @@ public class HttpResourceStream extends 
 
     @Override
     public String locationAsString() {
-        return location;
+        return null;
     }
 
     @Override

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleSelectModalPage.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleSelectModalPage.java?rev=1445558&r1=1445557&r2=1445558&view=diff
==============================================================================
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleSelectModalPage.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleSelectModalPage.java
 Wed Feb 13 11:36:45 2013
@@ -48,7 +48,7 @@ public class RoleSelectModalPage extends
 
     private final NestedTree<DefaultMutableTreeNode> tree;
 
-    public RoleSelectModalPage(final PageReference pageRef, final ModalWindow 
window, final Class payloadClass) {
+    public RoleSelectModalPage(final PageReference pageRef, final ModalWindow 
window, final Class<?> payloadClass) {
         super();
 
         final ITreeProvider<DefaultMutableTreeNode> treeProvider = new 
TreeRoleProvider(roleTreeBuilder, true);
@@ -101,6 +101,5 @@ public class RoleSelectModalPage extends
         DefaultMutableTreeNodeExpansion.get().expandAll();
 
         this.add(tree);
-
     }
 }