Skip to content

Commit 36bd7e7

Browse files
Fix issue on package creation
1 parent 3b53029 commit 36bd7e7

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

src/main/java/edu/cmu/oli/content/resource/builders/ContentPkgJsonReader.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ public static void parsePackageJson(ContentPackage mnfst, JsonObject pkgJson, bo
7979
mnfst.setOptions(new JsonWrapper(preferences));
8080

8181
String language = pkgJson.has("language") ? pkgJson.get("language").getAsString() : null;
82-
mnfst.setLanguage(language);
82+
if (language != null) {
83+
mnfst.setLanguage(language);
84+
}
8385

8486
mnfst.setErrors(new JsonWrapper(errors));
8587

src/main/java/edu/cmu/oli/content/resource/builders/ContentPkgXmlReader.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,9 @@ private static JsonObject parsePackageElement(Element pkgElmnt) throws BuildExce
104104

105105
// Language
106106
Element pkgLanguageElmnt = pkgElmnt.getChild("language");
107-
mnfstBuilder.addProperty("language", pkgLanguageElmnt == null ? null : pkgLanguageElmnt.getTextNormalize());
107+
if (pkgLanguageElmnt != null) {
108+
mnfstBuilder.addProperty("language", pkgLanguageElmnt == null ? null : pkgLanguageElmnt.getTextNormalize());
109+
}
108110

109111
return mnfstBuilder;
110112
}

0 commit comments

Comments
 (0)