Skip to content

Commit d26af7b

Browse files
committed
update Java version
1 parent 6ae3485 commit d26af7b

File tree

3 files changed

+36
-13
lines changed

3 files changed

+36
-13
lines changed

src/main/java/com/upokecenter/cbor/CBORDateConverter.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,14 @@ licensed under Creative Commons Zero (CC0):
1313

1414
class CBORDateConverter implements ICBORToFromConverter<java.util.Date> {
1515
private static String DateTimeToString(java.util.Date bi) {
16-
int[] lesserFields = new int[7];
17-
EInteger[] year = new EInteger[1];
18-
PropertyMap.BreakDownDateTime(bi, year, lesserFields);
19-
return CBORUtilities.ToAtomDateTimeString(year[0], lesserFields);
16+
try {
17+
int[] lesserFields = new int[7];
18+
EInteger[] year = new EInteger[1];
19+
PropertyMap.BreakDownDateTime(bi, year, lesserFields);
20+
return CBORUtilities.ToAtomDateTimeString(year[0], lesserFields);
21+
} catch (IllegalArgumentException ex) {
22+
throw new CBORException(ex.getMessage(), ex);
23+
}
2024
}
2125

2226
public java.util.Date FromCBORObject(CBORObject obj) {

src/main/java/com/upokecenter/cbor/PropertyMap.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,8 @@ public static Object ObjectWithProperties(
400400
}
401401
}
402402
return o;
403+
} catch(IllegalArgumentException ex) {
404+
throw (RuntimeException)new CBORException("").initCause(ex);
403405
} catch(InvocationTargetException ex) {
404406
throw (RuntimeException)new CBORException("").initCause(ex);
405407
} catch(NoSuchMethodException ex) {

src/test/java/com/upokecenter/test/CBORObjectTest.java

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5911,8 +5911,12 @@ public void TestCalcEncodedSizeCircularRefs3bc() {
59115911
throw new IllegalStateException("", ex);
59125912
}
59135913
cbor = CBORObject.NewOrderedMap().Add("ghi", 2).Add("abc", 4);
5914-
cbor.Add(CBORObject.NewOrderedMap().Add(cbor, "jkl").Add("mno",
5915-
1),"test");
5914+
{
5915+
Object objectTemp = CBORObject.NewOrderedMap().Add(cbor, "jkl").Add("mno",
5916+
1);
5917+
Object objectTemp2 = "test";
5918+
cbor.Add(objectTemp, objectTemp2);
5919+
}
59165920
try {
59175921
cbor.CalcEncodedSize();
59185922
Assert.fail("Should have failed");
@@ -5923,8 +5927,12 @@ public void TestCalcEncodedSizeCircularRefs3bc() {
59235927
throw new IllegalStateException("", ex);
59245928
}
59255929
cbor = CBORObject.NewOrderedMap().Add("ghi", 2).Add("abc", 4);
5926-
cbor.Add("test", CBORObject.NewOrderedMap().Add(cbor,
5927-
"jkl").Add("mno",1));
5930+
{
5931+
Object objectTemp = "test";
5932+
Object objectTemp2 = CBORObject.NewOrderedMap().Add(cbor,
5933+
"jkl").Add("mno",1);
5934+
cbor.Add(objectTemp, objectTemp2);
5935+
}
59285936
try {
59295937
cbor.CalcEncodedSize();
59305938
Assert.fail("Should have failed");
@@ -5935,8 +5943,12 @@ public void TestCalcEncodedSizeCircularRefs3bc() {
59355943
throw new IllegalStateException("", ex);
59365944
}
59375945
cbor = CBORObject.NewOrderedMap().Add("ghi", 2).Add("abc", 4);
5938-
cbor.Add("test", CBORObject.NewOrderedMap().Add("mno",
5939-
1).Add(cbor,"jkl"));
5946+
{
5947+
Object objectTemp = "test";
5948+
Object objectTemp2 = CBORObject.NewOrderedMap().Add("mno",
5949+
1).Add(cbor,"jkl");
5950+
cbor.Add(objectTemp, objectTemp2);
5951+
}
59405952
try {
59415953
cbor.CalcEncodedSize();
59425954
Assert.fail("Should have failed");
@@ -5947,8 +5959,12 @@ public void TestCalcEncodedSizeCircularRefs3bc() {
59475959
throw new IllegalStateException("", ex);
59485960
}
59495961
cbor = CBORObject.NewOrderedMap().Add("ghi", 2).Add("abc", 4);
5950-
cbor.Add(CBORObject.NewOrderedMap().Add("mno", 1).Add(cbor,
5951-
"jkl"),"test");
5962+
{
5963+
Object objectTemp = CBORObject.NewOrderedMap().Add("mno", 1).Add(cbor,
5964+
"jkl");
5965+
Object objectTemp2 = "test";
5966+
cbor.Add(objectTemp, objectTemp2);
5967+
}
59525968
try {
59535969
cbor.CalcEncodedSize();
59545970
Assert.fail("Should have failed");
@@ -5998,7 +6014,8 @@ public void TestCalcEncodedSizeCircularRefs3bc() {
59986014
cbor = CBORObject.NewOrderedMap().Add("ghi", 2).Add("abc", 4);
59996015

60006016
{
6001-
Object objectTemp = CBORObject.NewOrderedMap().Add(CBORObject.NewOrderedMap(),
6017+
Object objectTemp =
6018+
CBORObject.NewOrderedMap().Add(CBORObject.NewOrderedMap(),
60026019
"jkl");
60036020
Object objectTemp2 = "test";
60046021
cbor.Add(objectTemp, objectTemp2);

0 commit comments

Comments
 (0)