You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jo...@apache.org on 2001/09/29 02:46:29 UTC
cvs commit: jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake TurbineIntakeService.java
jon 01/09/28 17:46:29
Modified: src/services/java/org/apache/fulcrum/intake
TurbineIntakeService.java
Log:
check in a fix from John that fixes some appData issues on osx 10.1
also added some better handling of closing the streams.
Revision Changes Path
1.2 +22 -4 jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/TurbineIntakeService.java
Index: TurbineIntakeService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/TurbineIntakeService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineIntakeService.java 2001/08/23 07:20:21 1.1
+++ TurbineIntakeService.java 2001/09/29 00:46:29 1.2
@@ -87,7 +87,7 @@
* on an XML specification.
*
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
- * @version $Id: TurbineIntakeService.java,v 1.1 2001/08/23 07:20:21 jmcnally Exp $
+ * @version $Id: TurbineIntakeService.java,v 1.2 2001/09/29 00:46:29 jon Exp $
*/
public class TurbineIntakeService
extends BaseService
@@ -170,14 +170,21 @@
{
XmlToAppData xmlApp = new XmlToAppData();
appData = xmlApp.parseFile(xmlPath);
-
+ OutputStream out = null;
+ InputStream in = null;
try
{
- OutputStream out = new FileOutputStream(serialAppData);
+ // write the appData file out
+ out = new FileOutputStream(serialAppData);
ObjectOutputStream p = new ObjectOutputStream(out);
p.writeObject(appData);
p.flush();
- out.close();
+
+ // read the file back in. for some reason on OSX 10.1
+ // this is necessary.
+ in = new FileInputStream(serialAppData);
+ ObjectInputStream pin = new ObjectInputStream(in);
+ appData = (AppData)pin.readObject();
}
catch (Exception e)
{
@@ -186,6 +193,17 @@
"because writing to " + appDataPath + " was not " +
"allowed. This will require that the xml file be " +
"parsed when restarting the application.");
+ }
+ finally
+ {
+ if (out != null)
+ {
+ out.close();
+ }
+ if (in != null)
+ {
+ in.close();
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org