Author: max Date: 2008-02-19 12:45:57 -0800 (Tue, 19 Feb 2008) New Revision: 8064
Modified: openlaszlo/branches/pagan-deities/ openlaszlo/branches/pagan-deities/WEB-INF/lps/server/src/org/openlaszlo/data/XMLGrabber.java Log: Merged revisions 8062 via svnmerge from http://svn.openlaszlo.org/openlaszlo/trunk ....... r8062 | hqm | 2008-02-19 12:40:46 -0800 (Tue, 19 Feb 2008) | 37 lines Change 20080219-hqm-D by [EMAIL PROTECTED] on 2008-02-19 15:39:03 EST in /Users/hqm/openlaszlo/trunk/WEB-INF/lps/server/src for http://svn.openlaszlo.org/openlaszlo/trunk/WEB-INF/lps/server/src Summary: make sure LPS server data proxy will close http connection if errors occur New Features: Bugs Fixed: LPP-5440 Technical Reviewer: max QA Reviewer: pkang Doc Reviewer: (pending) Documentation: Release Notes: Details: If an ill-formed or empty document causes an error in the XML proxy server, it can leave the HTTP connection open, causing hangs on the client. This forces the stream to close on any error. I don't know how to easily throw an error asynchronously to the parent thread in Java, so we are just closing the connection for now. Tests: see bug report for test case ....... Property changes on: openlaszlo/branches/pagan-deities ___________________________________________________________________ Name: svnmerge-integrated - /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-7950,7983,8021 + /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-7950,7983,8021,8062 Modified: openlaszlo/branches/pagan-deities/WEB-INF/lps/server/src/org/openlaszlo/data/XMLGrabber.java =================================================================== --- openlaszlo/branches/pagan-deities/WEB-INF/lps/server/src/org/openlaszlo/data/XMLGrabber.java 2008-02-19 20:43:39 UTC (rev 8063) +++ openlaszlo/branches/pagan-deities/WEB-INF/lps/server/src/org/openlaszlo/data/XMLGrabber.java 2008-02-19 20:45:57 UTC (rev 8064) @@ -8,7 +8,7 @@ * ****************************************************************************/ /* J_LZ_COPYRIGHT_BEGIN ******************************************************* -* Copyright 2001-2007 Laszlo Systems, Inc. All Rights Reserved. * +* Copyright 2001-2008 Laszlo Systems, Inc. All Rights Reserved. * * Use is subject to license terms. * * J_LZ_COPYRIGHT_END *********************************************************/ @@ -147,12 +147,13 @@ public void run() { try { writeXMLDataToOutputStream(); - pout.flush(); - pout.close(); - } catch (XmlPullParserException ex) { - throw new RuntimeException(ex); - } catch (IOException ex) { - throw new RuntimeException(ex); + } catch (Exception e) { + } finally { + try { + pout.flush(); + pout.close(); + } catch (Exception e) { + } } } _______________________________________________ Laszlo-checkins mailing list [email protected] http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
