[vassalengine-svn] SF.net SVN: vassalengine:[6945] VASSAL-src/branches/uckelman-trunk-fix
Brought to you by:
rodneykinney,
uckelman
Menu
▾
▴
[vassalengine-svn] SF.net SVN: vassalengine:[6945] VASSAL-src/branches/uckelman-trunk-fix
|
From: <uck...@us...> - 2010-06-08 22:00:28
|
Revision: 6945
http://vassalengine.svn.sourceforge.net/vassalengine/?rev=6945&view=rev
Author: uckelman
Date: 2010-06-08 22:00:22 +0000 (Tue, 08 Jun 2010)
Log Message:
-----------
Merged uckelman-3.2@6890.
Make NumberFormatException the cause.
Modified Paths:
--------------
VASSAL-src/branches/uckelman-trunk-fix/src/VASSAL/tools/BugUtils.java
Property Changed:
----------------
VASSAL-src/branches/uckelman-trunk-fix/
Property changes on: VASSAL-src/branches/uckelman-trunk-fix
___________________________________________________________________
Modified: svn:mergeinfo
- /VASSAL-src/branches/3.1:4957,4960-4961,4984-4985,4988,4993,5004,5020,5041,5055,5059,5063-5065,5072-5073,5079,5084,5087,5098-5099,5133,5136,5138-5139,5156,5158,5161,5163,5166,5179-5181,5209,5260,5263,5274,5276,5280,5283-5290,5296,5298,5301-5450,5452-5456,5466-5467,5470,5473-5474,5479,5482,5488,5494-5495,5498,5502,5506,5510,5519,5525,5534,5540,5572,5575-5577,5582,5586,5588,5593,5595-5596,5599,5601,5721-5722,5726,5728-5729,5766-5767,5769,5771,5773,5793-5794,5812,5814,5816,5818,5820,5827,5833,5861,5863,5878,5880,5882,5892,5904,5912-5913,5916-5917,5920,5923-5924,5927,5939,5941,5943,5945,5955,5963,5965,5968,5989-5992,5994,5996-5997,5999,6003-6008,6012,6014,6021,6023,6026-6029,6039,6045,6047,6049,6056,6058-6059,6066-6067,6080,6093,6175,6213-6214,6253,6261,6264,6286,6366,6380,6382-6383,6391-6392,6467,6601,6879,6903
/VASSAL-src/branches/bsmith:4567-4756
/VASSAL-src/branches/bsmith/3.2-working:5236
/VASSAL-src/branches/bsmith/merge-3:5153
/VASSAL-src/branches/jimcot-3-1:6390
/VASSAL-src/branches/jimcot-trunk:6475
/VASSAL-src/branches/mkiefte:4821-4822,4867
/VASSAL-src/branches/mkiefte-3.1:5424,6019,6777
/VASSAL-src/branches/mkiefte-3.2:4991
/VASSAL-src/branches/nio-fs:6115-6462
/VASSAL-src/branches/rk-jabber:5293
/VASSAL-src/branches/swampwallaby-3.1:5134,5150-5151,5155,5165,5199,5257,5279,5294-5295,5303,5307-5308,5311,5319-5320,5329,5332,5352,5370,5425,5465,5468,5725,5762-5765,5788,5801-5802,5808-5810,5825,5847,5876,5890,5903,5907,5922,5935-5938,5947,5958,5983-5984,5986-5987,6038,6062,6243,6258-6260,6285,6353
/VASSAL-src/branches/swampwallaby-work:4458,4776,4806-4807,4819,4823-4825,4975,5067,5093
/VASSAL-src/branches/swampwallaby-work2:4840,4847,4883,4975,4980,4994,4996,4999-5000,5002-5003,5028
/VASSAL-src/branches/swampwallaby-work3:5086
/VASSAL-src/branches/swampwallaby-work5:4713
/VASSAL-src/branches/swampwallaby-work6:4727,4729-4730,4737,4742-4743,4747,4752,4776
/VASSAL-src/branches/uckelman-3.1:5389,5391,5400-5401,5403-5406,5411-5412,5415,5484-5487,5492-5493,5500-5501,5504,5509,5516,5518,5534,5872-5915,6010-6012,6016,6020
/VASSAL-src/branches/uckelman-3.2:6484-6515,6519-6531,6533-6560,6571-6576,6888
/VASSAL-src/branches/uckelman-findbugs:4869-4915
/VASSAL-src/branches/uckelman-test:5623,5626-5627,5631-5633,5692,5752,5783,5798-5799,6107
/VASSAL-src/branches/uckelman-tilecache:6026-6520
/VASSAL-src/branches/uckelman-work:4285,4657-4708,4769-4775,4779,4790,4799,4808,4814-4815,4817,4826,4924,4928,4933,4940,4965,4967-4971,5326,5347,5360-5361,5366-5368
/VASSAL-src/branches/wlk0-3.1:6464
/VASSAL-src/trunk:6466,6469,6472-6473,6480,6516,6560-6561,6569,6578,6596,6606,6880,6883,6886,6904
+ /VASSAL-src/branches/3.1:4957,4960-4961,4984-4985,4988,4993,5004,5020,5041,5055,5059,5063-5065,5072-5073,5079,5084,5087,5098-5099,5133,5136,5138-5139,5156,5158,5161,5163,5166,5179-5181,5209,5260,5263,5274,5276,5280,5283-5290,5296,5298,5301-5450,5452-5456,5466-5467,5470,5473-5474,5479,5482,5488,5494-5495,5498,5502,5506,5510,5519,5525,5534,5540,5572,5575-5577,5582,5586,5588,5593,5595-5596,5599,5601,5721-5722,5726,5728-5729,5766-5767,5769,5771,5773,5793-5794,5812,5814,5816,5818,5820,5827,5833,5861,5863,5878,5880,5882,5892,5904,5912-5913,5916-5917,5920,5923-5924,5927,5939,5941,5943,5945,5955,5963,5965,5968,5989-5992,5994,5996-5997,5999,6003-6008,6012,6014,6021,6023,6026-6029,6039,6045,6047,6049,6056,6058-6059,6066-6067,6080,6093,6175,6213-6214,6253,6261,6264,6286,6366,6380,6382-6383,6391-6392,6467,6601,6879,6903
/VASSAL-src/branches/bsmith:4567-4756
/VASSAL-src/branches/bsmith/3.2-working:5236
/VASSAL-src/branches/bsmith/merge-3:5153
/VASSAL-src/branches/jimcot-3-1:6390
/VASSAL-src/branches/jimcot-trunk:6475
/VASSAL-src/branches/mkiefte:4821-4822,4867
/VASSAL-src/branches/mkiefte-3.1:5424,6019,6777
/VASSAL-src/branches/mkiefte-3.2:4991
/VASSAL-src/branches/nio-fs:6115-6462
/VASSAL-src/branches/rk-jabber:5293
/VASSAL-src/branches/swampwallaby-3.1:5134,5150-5151,5155,5165,5199,5257,5279,5294-5295,5303,5307-5308,5311,5319-5320,5329,5332,5352,5370,5425,5465,5468,5725,5762-5765,5788,5801-5802,5808-5810,5825,5847,5876,5890,5903,5907,5922,5935-5938,5947,5958,5983-5984,5986-5987,6038,6062,6243,6258-6260,6285,6353
/VASSAL-src/branches/swampwallaby-work:4458,4776,4806-4807,4819,4823-4825,4975,5067,5093
/VASSAL-src/branches/swampwallaby-work2:4840,4847,4883,4975,4980,4994,4996,4999-5000,5002-5003,5028
/VASSAL-src/branches/swampwallaby-work3:5086
/VASSAL-src/branches/swampwallaby-work5:4713
/VASSAL-src/branches/swampwallaby-work6:4727,4729-4730,4737,4742-4743,4747,4752,4776
/VASSAL-src/branches/uckelman-3.1:5389,5391,5400-5401,5403-5406,5411-5412,5415,5484-5487,5492-5493,5500-5501,5504,5509,5516,5518,5534,5872-5915,6010-6012,6016,6020
/VASSAL-src/branches/uckelman-3.2:6484-6515,6519-6531,6533-6560,6571-6576,6888,6890
/VASSAL-src/branches/uckelman-findbugs:4869-4915
/VASSAL-src/branches/uckelman-test:5623,5626-5627,5631-5633,5692,5752,5783,5798-5799,6107
/VASSAL-src/branches/uckelman-tilecache:6026-6520
/VASSAL-src/branches/uckelman-work:4285,4657-4708,4769-4775,4779,4790,4799,4808,4814-4815,4817,4826,4924,4928,4933,4940,4965,4967-4971,5326,5347,5360-5361,5366-5368
/VASSAL-src/branches/wlk0-3.1:6464
/VASSAL-src/trunk:6466,6469,6472-6473,6480,6516,6560-6561,6569,6578,6596,6606,6880,6883,6886,6904
Modified: VASSAL-src/branches/uckelman-trunk-fix/src/VASSAL/tools/BugUtils.java
===================================================================
--- VASSAL-src/branches/uckelman-trunk-fix/src/VASSAL/tools/BugUtils.java 2010-06-08 21:59:32 UTC (rev 6944)
+++ VASSAL-src/branches/uckelman-trunk-fix/src/VASSAL/tools/BugUtils.java 2010-06-08 22:00:22 UTC (rev 6945)
@@ -39,15 +39,16 @@
pb.setParameter("log", "errorLog", errorLog);
in = pb.post(url);
+ final String result = IOUtils.toString(in);
// script should return zero on success, otherwise it failed
try {
- if (Integer.parseInt(IOUtils.toString(in)) != 0) {
- throw new NumberFormatException();
+ if (Integer.parseInt(result) != 0) {
+ throw new NumberFormatException("Bad result: " + result);
}
}
catch (NumberFormatException e) {
- throw new IOException();
+ throw (IOException) new IOException().initCause(e);
}
in.close();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|