Skip to content

Commit 1fd9cdf

Browse files
committed
duplicate code improvement
1 parent 5014bfa commit 1fd9cdf

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

framework/src/main/java/org/tron/core/services/http/GetBlockByLatestNumServlet.java

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
2323
try {
2424
boolean visible = Util.getVisible(request);
2525
long getNum = Long.parseLong(request.getParameter("num"));
26-
if (getNum > 0 && getNum < BLOCK_LIMIT_NUM) {
27-
BlockList reply = wallet.getBlockByLatestNum(getNum);
28-
if (reply != null) {
29-
response.getWriter().println(Util.printBlockList(reply, visible));
30-
return;
31-
}
32-
}
33-
response.getWriter().println("{}");
26+
outWrite(getNum, visible, response);
3427
} catch (Exception e) {
3528
Util.processError(e, response);
3629
}
@@ -45,16 +38,25 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
4538
NumberMessage.Builder build = NumberMessage.newBuilder();
4639
JsonFormat.merge(input, build, visible);
4740
long getNum = build.getNum();
48-
if (getNum > 0 && getNum < BLOCK_LIMIT_NUM) {
49-
BlockList reply = wallet.getBlockByLatestNum(getNum);
50-
if (reply != null) {
51-
response.getWriter().println(Util.printBlockList(reply, visible));
52-
return;
53-
}
54-
}
55-
response.getWriter().println("{}");
41+
outWrite(getNum, visible, response);
5642
} catch (Exception e) {
5743
Util.processError(e, response);
5844
}
5945
}
46+
47+
private void outWrite(long getNum, boolean visible, HttpServletResponse response) throws Exception {
48+
if (getNum > 0 && getNum < BLOCK_LIMIT_NUM) {
49+
BlockList reply = wallet.getBlockByLatestNum(getNum);
50+
if (reply != null) {
51+
response.getWriter().println(Util.printBlockList(reply, visible));
52+
return;
53+
}
54+
else {
55+
response.getWriter().println("{}");
56+
}
57+
}else {
58+
response.getWriter().println("{}");
59+
}
60+
}
61+
6062
}

0 commit comments

Comments
 (0)