diff --git a/src/main/java/com/fr/demo/NewReadFrmFromDatabase.java b/src/main/java/com/fr/demo/NewReadFrmFromDatabase.java index 8186fe9..0895cc7 100644 --- a/src/main/java/com/fr/demo/NewReadFrmFromDatabase.java +++ b/src/main/java/com/fr/demo/NewReadFrmFromDatabase.java @@ -1,16 +1,18 @@ package com.fr.demo; import com.fr.data.core.db.DBUtils; -import com.fr.web.weblet.DBFormlet; import com.fr.form.main.Form; -import java.sql.SQLException; -import javax.servlet.http.HttpServletRequest; import com.fr.log.FineLoggerFactory; +import com.fr.web.session.SessionLocalManager; +import com.fr.web.weblet.DBFormlet; + +import javax.servlet.http.HttpServletRequest; import java.io.InputStream; import java.sql.Blob; import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Statement; import java.util.Map; @@ -26,7 +28,7 @@ public class NewReadFrmFromDatabase extends DBFormlet { @Override public Form createForm(String reportName) { - Form form = new Form(); + Form form = null; Connection connection = null; try { connection = getConnection(); @@ -43,12 +45,12 @@ public class NewReadFrmFromDatabase extends DBFormlet { return form; } } catch (Exception e) { - e.printStackTrace(); + throw SessionLocalManager.createLogPackedException(e); }finally { DBUtils.closeConnection(connection); } - return null; + return form; } private static Connection getConnection() throws ClassNotFoundException, SQLException { diff --git a/src/main/java/com/fr/demo/ReadFromDatabase.java b/src/main/java/com/fr/demo/ReadFromDatabase.java index c5ad4eb..f78c426 100644 --- a/src/main/java/com/fr/demo/ReadFromDatabase.java +++ b/src/main/java/com/fr/demo/ReadFromDatabase.java @@ -5,6 +5,8 @@ import com.fr.main.impl.WorkBook; import com.fr.web.core.Reportlet; import com.fr.web.request.ReportletRequest; import com.fr.log.FineLoggerFactory; +import com.fr.web.session.SessionLocalManager; + import java.io.InputStream; import java.sql.Blob; import java.sql.Connection; @@ -40,7 +42,7 @@ public class ReadFromDatabase extends Reportlet { workbook.readStream(ins); } } catch (Exception e) { - e.printStackTrace(); + throw SessionLocalManager.createLogPackedException(e); } return workbook; } diff --git a/src/main/java/com/fr/demo/ReadfrmFromDatabase.java b/src/main/java/com/fr/demo/ReadfrmFromDatabase.java index 601fca0..143ea1f 100644 --- a/src/main/java/com/fr/demo/ReadfrmFromDatabase.java +++ b/src/main/java/com/fr/demo/ReadfrmFromDatabase.java @@ -1,10 +1,12 @@ package com.fr.demo; +import com.fr.form.main.Form; import com.fr.io.utils.ResourceIOUtils; +import com.fr.log.FineLoggerFactory; +import com.fr.web.session.SessionLocalManager; import com.fr.web.weblet.Formlet; -import com.fr.form.main.Form; + import javax.servlet.http.HttpServletRequest; -import com.fr.log.FineLoggerFactory; import java.io.InputStream; import java.sql.Blob; import java.sql.Connection; @@ -42,7 +44,7 @@ public class ReadfrmFromDatabase extends Formlet { form.readStream(ins); } } catch (Exception e) { - e.printStackTrace(); + throw SessionLocalManager.createLogPackedException(e); } System.out.println(ResourceIOUtils.getRealPath("assets")); return form;