Conflicts:
	src/main/java/com/alibaba/fastjson/serializer/SerializeWriter.java
This commit is contained in:
温少
2012-01-17 23:14:07 +08:00
2 changed files with 9 additions and 1 deletions
+8 -1
View File
@@ -122,6 +122,13 @@
<version>1.9.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>2.2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-lgpl</artifactId>
@@ -177,7 +184,7 @@
<version>1.0.6.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
@@ -739,6 +739,7 @@ public final class SerializeWriter extends Writer {
} else {
buf[count - 1] = '\"';
}
return;
}