From de8bae43512d50b8c828ba27cf5fd6ca211b4b2c Mon Sep 17 00:00:00 2001 From: greatim Date: Fri, 4 Jul 2014 14:05:05 +0900 Subject: [PATCH] CMMN, DB : bug fix for exception when receive ack message of control message, receive buffer is too small. when newly added feature page is displayed, corresposding DB table is not exist so SQLExcpetion is occurred Change-Id: I92b3aef82c763deb5f99b26618873fde359268fb Signed-off-by: greatim --- .../tizen/dynamicanalyzer/database/SqlConnectionManager.java | 5 +++++ .../dynamicanalyzer/swap/communicator/Communicator30.java | 12 ++++++++++-- package/changelog | 4 ++++ package/pkginfo.manifest | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java index 8ed6ff0..63eac5a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java @@ -6,6 +6,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; +import java.sql.SQLSyntaxErrorException; import java.sql.SQLWarning; import java.sql.Statement; import java.util.ArrayList; @@ -493,6 +494,10 @@ public class SqlConnectionManager { } } } + } catch (SQLSyntaxErrorException e) { + String message = e.getMessage(); + String state = e.getSQLState(); + DA_LOG.warning(message + " : state(" + state + ")"); } catch (SQLException e) { e.printStackTrace(); } finally { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java index 09d3693..42ae018 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java @@ -37,6 +37,7 @@ import static org.tizen.dynamicanalyzer.constant.CommonConstants.LONG_SIZE; import java.io.BufferedReader; import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -539,7 +540,7 @@ public class Communicator30 extends BaseCommunicator { rt.setApplyTime(ToolbarArea.getInstance().getTime()); AnalyzerManager.getProject().addConfigHistory(rt); } else { - rt.setApplyTime(0); // set time of configuration to zero + rt.setApplyTime(0); // set time of configuration to zero } GlobalInformation.setCurrentConfiguration(rt); @@ -627,8 +628,15 @@ public class Communicator30 extends BaseCommunicator { byte[] cbuf = new byte[DACommunicator.READ_BUFFER_SIZE * 2]; blocked = true; DA_LOG.debug("blocked"); - readsize = controlSock.getInputStream().read(cbuf); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + do { + readsize = controlSock.getInputStream().read(cbuf); + baos.write(cbuf, 0, readsize); + } while (readsize == DACommunicator.READ_BUFFER_SIZE * 2); blocked = false; + + readsize = baos.size(); + cbuf = baos.toByteArray(); if (PRINT_CONTROL_LOG_TOFILE && printWriter != null) { printWriter.printf("recv :"); for (int k = 0; k < readsize; k++) diff --git a/package/changelog b/package/changelog index 39f83bf..90ba6b2 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,7 @@ +* 2.1.39 +- bug fix for exception when specific application is selected in app combo +- bug fix for exception when new feature is on and feature page is newly displayed +== Jaewon Lim 2014-07-04 * 2.1.38 - Refactoring: OpenGL, Network, Chart - Bug fix: failure in leak detection of range analysis diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 047b975..2a4e36f 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,5 +1,5 @@ Source:dynamic-analyzer -Version:2.1.38 +Version:2.1.39 Maintainer:Jaewon Lim , Juyoung Kim Package:dynamic-analyzer-product -- 2.7.4