Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Carpe diem
Jfinal
Commits
aa4a95af
Commit
aa4a95af
authored
10 years ago
by
James
Browse files
Options
Download
Email Patches
Plain Diff
jfinal 1.9 release ^_^
parent
af6469eb
master
jfinal-3.9
jfinal-java8
jfinal-java8-3.4
jfinal-java8-3.3
jfinal-java8-3.2
jfinal-4.9.21
jfinal-4.9.20
jfinal-4.9.19
jfinal-4.9.18
jfinal-4.9.17
jfinal-4.9.16
jfinal-4.9.15
jfinal-4.9.14
jfinal-4.9.13
jfinal-4.9.12
jfinal-4.9.11
jfinal-4.9.10
jfinal-4.9.09
jfinal-4.9.08
jfinal-4.9.06
jfinal-4.9.05
jfinal-4.9.04
jfinal-4.9.03
jfinal-4.9.02
jfinal-4.9
jfinal-4.8
jfinal-4.7
jfinal-4.6
jfinal-4.5
jfinal-4.4
jfinal-4.3
jfinal-4.2
jfinal-4.1
jfinal-4.0
jfinal-3.8
jfinal-3.7
jfinal-3.6
jfinal-3.5
jfinal-3.4
jfinal-3.3
jfinal-3.2
jfinal-3.1
jfinal-3.0
jfinal-2.2
jfinal-2.1
jfinal-2.0
jfinal-1.9
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/com/jfinal/kit/Prop.java
+1
-1
src/com/jfinal/kit/Prop.java
src/com/jfinal/render/FileRender.java
+2
-2
src/com/jfinal/render/FileRender.java
src/com/jfinal/render/RenderFactory.java
+4
-0
src/com/jfinal/render/RenderFactory.java
with
7 additions
and
3 deletions
+7
-3
src/com/jfinal/kit/Prop.java
+
1
-
1
View file @
aa4a95af
...
...
@@ -90,7 +90,7 @@ public class Prop {
if
(
file
==
null
)
throw
new
IllegalArgumentException
(
"File can not be null."
);
if
(
file
.
isFile
()
==
false
)
throw
new
IllegalArgumentException
(
"
File not found
: "
+
file
.
getName
());
throw
new
IllegalArgumentException
(
"
Not a file
: "
+
file
.
getName
());
InputStream
inputStream
=
null
;
try
{
...
...
This diff is collapsed.
Click to expand it.
src/com/jfinal/render/FileRender.java
+
2
-
2
View file @
aa4a95af
...
...
@@ -187,11 +187,11 @@ public class FileRender extends Render {
}
}
//
condition
like: 9500-
//
Range format
like: 9500-
if
(
range
[
0
]
!=
null
&&
range
[
1
]
==
null
)
{
range
[
1
]
=
fileLength
-
1
;
}
//
condition
like: -500
//
Range format
like: -500
else
if
(
range
[
0
]
==
null
&&
range
[
1
]
!=
null
)
{
range
[
0
]
=
fileLength
-
range
[
1
];
range
[
1
]
=
fileLength
-
1
;
...
...
This diff is collapsed.
Click to expand it.
src/com/jfinal/render/RenderFactory.java
+
4
-
0
View file @
aa4a95af
...
...
@@ -109,11 +109,15 @@ public class RenderFactory {
private
void
initJspRender
(
ServletContext
servletContext
)
{
try
{
Class
.
forName
(
"javax.el.ELResolver"
);
Class
.
forName
(
"javax.servlet.jsp.JspFactory"
);
com
.
jfinal
.
plugin
.
activerecord
.
ModelRecordElResolver
.
init
(
servletContext
);
}
catch
(
ClassNotFoundException
e
)
{
// System.out.println("Jsp or JSTL can not be supported!");
}
catch
(
Exception
e
)
{
}
}
private
void
initFileRender
(
ServletContext
servletContext
)
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help