Merge branch 'master' of github.com:igniterealtime/Smack

igniterealtime · Jul 30, 2019 · eecd5b7 · eecd5b7
2 parents 8da954f + 96e1447
commit eecd5b7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/NumberUtil.java b/smack-core/src/main/java/org/jivesoftware/smack/util/NumberUtil.java
@@ -40,7 +40,7 @@ public static long requireUInt32(long value) {
             throw new IllegalArgumentException("unsigned 32-bit integers can't be negative");
         }
         if (value > ((1L << 32) - 1)) {
-            throw new IllegalArgumentException("unsigned 32-bit integers can't be greater then 2^32 - 1");
+            throw new IllegalArgumentException("unsigned 32-bit integers can't be greater than 2^32 - 1");
         }
         return value;
     }

diff --git a/...k-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/element/MediaElement.java b/...k-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/element/MediaElement.java
@@ -90,7 +90,7 @@ public XmlStringBuilder toXML(XmlEnvironment xmlEnvironment) {
         xml.append(uris, xmlEnvironment);
 
         xml.closeElement(this);
-        return null;
+        return xml;
     }
 
     public MediaElement from(FormField formField) {