From 8de10b552da27cf60840f8751a216dbcaa47128e Mon Sep 17 00:00:00 2001 From: pankaj Date: Tue, 24 May 2022 16:05:37 +0530 Subject: [PATCH 1/2] live location handle null exception --- .../uci/transformer/odk/ODKConsumerReactive.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/uci/transformer/odk/ODKConsumerReactive.java b/src/main/java/com/uci/transformer/odk/ODKConsumerReactive.java index d857657..6cc9ff3 100644 --- a/src/main/java/com/uci/transformer/odk/ODKConsumerReactive.java +++ b/src/main/java/com/uci/transformer/odk/ODKConsumerReactive.java @@ -178,6 +178,9 @@ public void accept(XMessage transformedMessage) { }); } catch (JAXBException e) { e.printStackTrace(); + } catch (NullPointerException e) { + log.error("An error occured : "+e.getMessage() + " at line no : "+ e.getStackTrace()[0].getLineNumber() + +" in class : "+e.getStackTrace()[0].getClassName()); } catch (Exception e) { e.printStackTrace(); } @@ -210,7 +213,9 @@ public Mono transform(XMessage xMessage) throws Exception { log.info("current form ID:"+formID); String formPath = getFormPath(formID); log.info("current form path:"+formPath); - + if(formPath == null ){ + return null; + } isStartingMessage = xMessage.getPayload().getText().equals(getTransformerMetaDataValue(transformer, "startingMessage")); Boolean addOtherOptions = xMessage.getProvider().equals("sunbird") ? true : false; @@ -713,7 +718,12 @@ private XMessage getMessageFromResponse(XMessage xMessage, ServiceResponse respo public static String getFormPath(String formID) { FormsDao dao = new FormsDao(JsonDB.getInstance().getDB()); - return dao.getFormsCursorForFormId(formID).getFormFilePath(); + try{ + return dao.getFormsCursorForFormId(formID).getFormFilePath(); + } catch (NullPointerException ex){ + log.info("ODK form not found '"+formID+"'"); + return null; + } } private Mono appendNewResponse(String formID, XMessage xMessage, ServiceResponse response) { From 349da94c6d0d10b51b84f0874496a55789d4a30c Mon Sep 17 00:00:00 2001 From: pankaj Date: Fri, 27 May 2022 18:25:44 +0530 Subject: [PATCH 2/2] Support Media for PWA --- src/main/java/com/uci/transformer/odk/ODKConsumerReactive.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/uci/transformer/odk/ODKConsumerReactive.java b/src/main/java/com/uci/transformer/odk/ODKConsumerReactive.java index 6cc9ff3..4a5b899 100644 --- a/src/main/java/com/uci/transformer/odk/ODKConsumerReactive.java +++ b/src/main/java/com/uci/transformer/odk/ODKConsumerReactive.java @@ -216,7 +216,7 @@ public Mono transform(XMessage xMessage) throws Exception { if(formPath == null ){ return null; } - isStartingMessage = xMessage.getPayload().getText().equals(getTransformerMetaDataValue(transformer, "startingMessage")); + isStartingMessage = xMessage.getPayload().getText() == null ? false : xMessage.getPayload().getText().equals(getTransformerMetaDataValue(transformer, "startingMessage")); Boolean addOtherOptions = xMessage.getProvider().equals("sunbird") ? true : false; // Get details of user from database