Merge all changes from 1.5.2 branch into trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830026 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 1 insertions, 9 deletions

diff --git a/branches/sca-java-1.x/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java b/branches/sca-java-1.x/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java
index 3d2b89f213..5b74c5584e 100644
--- a/branches/sca-java-1.x/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java
+++ b/branches/sca-java-1.x/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java
@@ -20,7 +20,6 @@ package itest;
 

 import java.io.BufferedReader;

 import java.io.File;

-import java.io.FileNotFoundException;

 import java.io.IOException;

 import java.io.InputStream;

 import java.io.InputStreamReader;

@@ -42,14 +41,7 @@ public class LicenseTestCase extends TestCase {
     public void testCreateComponent() throws ZipException, IOException {

 

         File archive = new File("..\\..\\distribution\\target\\apache-tuscany-sca-1.6-SNAPSHOT.zip");

-        ZipFile zf = null;

-

-        try {

-            zf = new ZipFile(archive);

-        } catch (FileNotFoundException e) {

-            return;  // archive has not been built yet

-        }

-

+        ZipFile zf = new ZipFile(archive);

         try {

 

             String licenstText = getLicenseText(zf);