portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager WarInfusionPAM.java
Date Sat, 12 Feb 2005 15:02:47 GMT
ate         2005/02/12 07:02:47

  Modified:    portal/src/java/org/apache/jetspeed/tools/pamanager
                        WarInfusionPAM.java
  Log:
  Corrected log message type from error to info when deployed sucessful.
  Explicitely close FileInputStream after creating new Manifest from it, otherwise
  a file lock may prevent removing the temporary expanded war file (on XP).
  
  Revision  Changes    Path
  1.5       +11 -3     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/WarInfusionPAM.java
  
  Index: WarInfusionPAM.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/WarInfusionPAM.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WarInfusionPAM.java	7 Feb 2005 06:59:28 -0000	1.4
  +++ WarInfusionPAM.java	12 Feb 2005 15:02:47 -0000	1.5
  @@ -245,7 +245,7 @@
           deleteFile(deployPortletAppDirectory, true);
           if (!deployPortletAppContextFile.exists() && !deployPortletAppDirectory.exists()
&& !deployPortletAppWarFile.exists())
           {
  -            log.error("Portlet application undeployment of " + deployPortletAppWarFile.getAbsolutePath()
+ ", " + deployPortletAppContextFile.getAbsolutePath() + ", and/or " + deployPortletAppDirectory.getAbsolutePath()
+ " complete.");
  +            log.info("Portlet application undeployment of " + deployPortletAppWarFile.getAbsolutePath()
+ ", " + deployPortletAppContextFile.getAbsolutePath() + ", and/or " + deployPortletAppDirectory.getAbsolutePath()
+ " complete.");
           }
           else
           {
  @@ -358,7 +358,15 @@
                           File tempWarManifestFile = (File) warFiles.get("META-INF/MANIFEST.MF");
                           if (tempWarManifestFile != null)
                           {
  -                            tempWarManifest = new Manifest(new FileInputStream(tempWarManifestFile));
  +                            FileInputStream in = new FileInputStream(tempWarManifestFile);
  +                            try
  +                            {
  +                              tempWarManifest = new Manifest(in);
  +                            }
  +                            finally
  +                            {
  +                              in.close();
  +                            }
                           }
                           else
                           {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message