• R/O
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision85 (tree)
Time2015-08-23 13:53:34
Authort_nakayama1971

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/framework/trial/src/online/filter/SingleVirtualUrlFilter.java (revision 84)
+++ trunk/framework/trial/src/online/filter/SingleVirtualUrlFilter.java (revision 85)
@@ -12,13 +12,13 @@
1212 import javax.servlet.http.HttpServletResponse;
1313 import javax.servlet.http.HttpSession;
1414
15+import org.apache.logging.log4j.LogManager;
16+
1517 import online.filter.helper.DuplicateBodyResponse;
1618 import online.filter.helper.DuplicateHeaderWrapper;
1719 import online.filter.helper.InterceptResponseWrapper;
1820 import online.listener.SessionMutexListener;
1921
20-import org.apache.logging.log4j.LogManager;
21-
2222 /**
2323 * 単一仮想URLフィルター
2424 *
@@ -113,11 +113,7 @@
113113 DuplicateBodyResponse dbr = DuplicateBodyResponse.class.cast(
114114 session.getAttribute(this.path));
115115 if (dbr != null) {
116- try {
117- dbr.copyResponse(response);
118- } catch (IOException ex) {
119- LogManager.getLogger().info(ex.getMessage());
120- }
116+ dbr.copyResponse(response);
121117 return true;
122118 }
123119 }
--- trunk/framework/fwOnline/src/online/filter/helper/DuplicateBodyResponse.java (revision 84)
+++ trunk/framework/fwOnline/src/online/filter/helper/DuplicateBodyResponse.java (revision 85)
@@ -139,20 +139,23 @@
139139 * レスポンス複製処理
140140 *
141141 * @param response 複製対象レスポンス
142- * @throws IOException IO例外
143142 */
144- public void copyResponse(final HttpServletResponse response) throws IOException {
143+ public void copyResponse(final HttpServletResponse response) {
145144 if (response != null) {
146- this.dhr.copyResponse(response);
145+ try {
146+ this.dhr.copyResponse(response);
147147
148- // キャラクタ配列ライタ
149- if (this.charWriter != null) {
150- response.getWriter().write(this.charWriter.toString());
148+ // キャラクタ配列ライタ
149+ if (this.charWriter != null) {
150+ response.getWriter().write(this.charWriter.toString());
151+ }
152+ // 出力ストリーム
153+ if (this.dow != null) {
154+ response.getOutputStream().print(this.dow.toString());
155+ }
156+ } catch (final IOException ex) {
157+ LogManager.getLogger().info(ex.getMessage());
151158 }
152- // 出力ストリーム
153- if (this.dow != null) {
154- response.getOutputStream().print(this.dow.toString());
155- }
156159 }
157160 }
158161
--- trunk/framework/fwOnline/src/online/filter/RedirectRequestFilter.java (revision 84)
+++ trunk/framework/fwOnline/src/online/filter/RedirectRequestFilter.java (revision 85)
@@ -17,16 +17,13 @@
1717 import javax.servlet.http.HttpServletResponse;
1818 import javax.servlet.http.HttpSession;
1919
20+import core.config.Factory;
21+import core.util.NumberUtil;
22+import core.util.bean.Pair;
2023 import online.filter.helper.DuplicateBodyResponse;
2124 import online.filter.helper.DuplicateHeaderWrapper;
2225 import online.listener.SessionMutexListener;
2326
24-import org.apache.logging.log4j.LogManager;
25-
26-import core.config.Factory;
27-import core.util.NumberUtil;
28-import core.util.bean.Pair;
29-
3027 /**
3128 * RedirectRequestフィルタ
3229 *
@@ -133,16 +130,12 @@
133130 Pair<LocalDateTime, DuplicateBodyResponse> pair = Pair.class.cast(
134131 session.getAttribute(location));
135132 if (pair != null) {
136- try {
137- pair.right().copyResponse(response);
138- if (0 != pair.right().getHeader().getStatus()) {
139- session.removeAttribute(location);
140- if (list != null) {
141- list.remove(location);
142- }
133+ pair.right().copyResponse(response);
134+ if (0 != pair.right().getHeader().getStatus()) {
135+ session.removeAttribute(location);
136+ if (list != null) {
137+ list.remove(location);
143138 }
144- } catch (final IOException ex) {
145- LogManager.getLogger().info(ex.getMessage());
146139 }
147140 return true;
148141 }