[jboss-svn-commits] JBL Code SVN: r35143 - labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/server/files.

[jboss-svn-commits at lists.jboss.org]

Author: dennyxu
Date: 2010-09-15 01:35:37 -0400 (Wed, 15 Sep 2010)
New Revision: 35143

Modified:
   labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/server/files/WebDAVImpl.java
Log:
merge the fix for GUVNOR-604 into branch5.1.x

Modified: labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/server/files/WebDAVImpl.java
===================================================================
--- labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/server/files/WebDAVImpl.java	2010-09-15 02:17:58 UTC (rev 35142)
+++ labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/server/files/WebDAVImpl.java	2010-09-15 05:35:37 UTC (rev 35143)
@@ -325,9 +325,10 @@
             PackageItem pkg = repository.loadPackage( path[1] );
             if ( path.length == 2 ) {
                 //dealing with package
-                return createStoredObject( uri,
-                                           pkg,
-                                           0 );
+            	return createStoredObject( uri,
+                        pkg,
+                        0 );
+
             } else {
                 String fileName = path[2];
                 String assetName = AssetItem.getAssetNameFromFileName( fileName )[0];
@@ -343,18 +344,27 @@
             }
         } else if ( path[0].equals( "snapshots" ) && checkPackagePermission( path[1],
                                                                              RoleTypes.PACKAGE_READONLY ) ) {
-            if ( path.length == 3 ) {
+        	if( path.length == 2 ){
+        		PackageItem pkg = repository.loadPackage( path[1] );
+        		StoredObject so = createStoredObject( uri,
+                        pkg,
+                        0 );
+                so.setFolder( isFolder( uri ) );
+
+                return so;
+        	}
+        	else if ( path.length == 3 ) {
                 PackageItem snapshot = repository.loadPackageSnapshot( path[1],
                                                                        path[2] );
-                AssetItem asset;
-                try {
-                    asset = snapshot.loadAsset( AssetItem.getAssetNameFromFileName( path[2] )[0] );
-                } catch ( Exception e ) {
-                    return null;
-                }
+//                AssetItem asset;
+//                try {
+//                    asset = snapshot.loadAsset( AssetItem.getAssetNameFromFileName( path[2] )[0] );
+//                } catch ( Exception e ) {
+//                    return null;
+//                }
                 return createStoredObject( uri,
                                            snapshot,
-                                           asset.getContentLength() );
+                                           0 );
             } else if ( path.length == 4 ) {
                 PackageItem pkg = repository.loadPackageSnapshot( path[1],
                                                                   path[2] );