dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2045
committer: Bob Jolliffe bobjolliffe@xxxxxxxxx
branch nick: trunk
timestamp: Fri 2010-09-03 10:23:06 +0100
message:
  Changed unknown content-type test to just trigger a log warning rather than aborting import.
modified:
  dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/ImportAction.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/ImportAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/ImportAction.java	2010-06-04 17:44:41 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/ImportAction.java	2010-09-03 09:23:06 +0000
@@ -72,7 +72,7 @@
         "application/zip", 
         "application/x-gzip", 
         "application/octet-stream", 
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         "text/xml" );
     
     // -------------------------------------------------------------------------
@@ -221,8 +221,6 @@
                 message = i18n.getString( "file_type_not_allowed" );
 
                 log.warn( "Content type not allowed: " + contentType );
-
-                return SUCCESS;
             }
             
             in = new BufferedInputStream( new FileInputStream( file ) );