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
小 白蛋
Fastjson
Commits
cfcf4acb
Commit
cfcf4acb
authored
9 years ago
by
高铁
Browse files
Options
Download
Email Patches
Plain Diff
bug fixed for toJSON
parent
e2ef095f
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/com/alibaba/fastjson/JSON.java
+4
-1
src/main/java/com/alibaba/fastjson/JSON.java
src/main/java/com/alibaba/fastjson/serializer/JavaBeanSerializer.java
+7
-2
...a/com/alibaba/fastjson/serializer/JavaBeanSerializer.java
with
11 additions
and
3 deletions
+11
-3
src/main/java/com/alibaba/fastjson/JSON.java
+
4
-
1
View file @
cfcf4acb
...
...
@@ -525,7 +525,10 @@ public abstract class JSON implements JSONStreamAware, JSONAware {
JSONObject
json
=
new
JSONObject
();
try
{
javaBeanSerializer
.
getFieldValues
(
javaObject
,
json
);
Map
<
String
,
Object
>
values
=
javaBeanSerializer
.
getFieldValuesMap
(
javaObject
);
for
(
Map
.
Entry
<
String
,
Object
>
entry
:
values
.
entrySet
())
{
json
.
put
(
entry
.
getKey
(),
toJSON
(
entry
.
getValue
()));
}
}
catch
(
Exception
e
)
{
throw
new
JSONException
(
"toJSON error"
,
e
);
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/alibaba/fastjson/serializer/JavaBeanSerializer.java
+
7
-
2
View file @
cfcf4acb
...
...
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import
java.util.Arrays
;
import
java.util.HashMap
;
import
java.util.IdentityHashMap
;
import
java.util.LinkedHashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -602,9 +603,13 @@ public class JavaBeanSerializer implements ObjectSerializer {
}
}
public
void
getFieldValues
(
Object
object
,
Map
<
String
,
Object
>
outMap
)
throws
Exception
{
public
Map
<
String
,
Object
>
getFieldValuesMap
(
Object
object
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
new
LinkedHashMap
<
String
,
Object
>(
sortedGetters
.
length
);
for
(
FieldSerializer
getter
:
sortedGetters
)
{
outM
ap
.
put
(
getter
.
fieldInfo
.
name
,
getter
.
getPropertyValue
(
object
));
m
ap
.
put
(
getter
.
fieldInfo
.
name
,
getter
.
getPropertyValue
(
object
));
}
return
map
;
}
}
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