Merge branch 'master' of https://github.com/hiroxpepe/blog-examproject

hiroxpepe · Jun 1, 2020 · 846f25a · 846f25a
2 parents a6625bc + fb697b1
commit 846f25a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-web: java $JAVA_OPTS -jar target/dependency/jetty-runner.jar --port $PORT exmp-blog-webapp/target/*.war
+web: java $JAVA_OPTS -jar target/dependency/jetty-runner.jar --port $PORT webapp/target/*.war
diff --git a/pom.xml b/pom.xml
@@ -54,10 +54,8 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.eclipse.jetty</groupId>
-                                    <!--<groupId>org.mortbay.jetty</groupId>-->
                                     <artifactId>jetty-runner</artifactId>
                                     <version>9.4.19.v20190610</version>
-                                    <!--<version>7.4.5.v20110725</version>-->
                                     <destFileName>jetty-runner.jar</destFileName>
                                 </artifactItem>
                             </artifactItems>

diff --git a/service/src/main/java/org/examproject/blog/util/TagUtils.java b/service/src/main/java/org/examproject/blog/util/TagUtils.java
@@ -103,7 +103,7 @@ public Set<EntryTag> getEntryTagSet(
                     // confirm the existence of the entry's tag.
                     List<EntryTag> entryTagList = entryTagRepository.findByEntryAndTag(entry, tag);
                     // this tag is new one for the entry.
-                    if (entryTagList == null) {
+                    if (entryTagList.isEmpty()) {
                         entryTag = context.getBean(EntryTag.class);
                         entryTag.setEntry(entry);
                         entryTag.setTag(tag);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		web: java $JAVA_OPTS -jar target/dependency/jetty-runner.jar --port $PORT exmp-blog-webapp/target/*.war
		web: java $JAVA_OPTS -jar target/dependency/jetty-runner.jar --port $PORT webapp/target/*.war