commit deb6d5d52ffc9ae68c082a7ea2c0d78ccfbb135d
author Brian Carlstrom <bdc@google.com> Fri May 10 09:50:08 2013 -0700
committer Brian Carlstrom <bdc@google.com> Fri May 10 09:50:08 2013 -0700
tree ee1287ec8e5a1817afd510f6c0759b6b104b3427
parent b50e3d9d138cf56d24726b3f7ed6aa14207d9cf5

Fix punctuation difference in merge resolution

Change-Id: Ib280a03cfa4ebf83244ac84b500a810d63260408

JNIHelp.cpp

diff --git a/JNIHelp.cpp b/JNIHelp.cpp
index b5fba99..0629a53 100644
--- a/JNIHelp.cpp
+++ b/JNIHelp.cpp
@@ -78,13 +78,13 @@
     scoped_local_ref<jclass> c(env, findClass(env, className));
     if (c.get() == NULL) {
         char* msg;
-        asprintf(&msg, "Native registration unable to find class '%s', aborting...", className);
+        asprintf(&msg, "Native registration unable to find class '%s'; aborting...", className);
         e->FatalError(msg);
     }
 
     if ((*env)->RegisterNatives(e, c.get(), gMethods, numMethods) < 0) {
         char* msg;
-        asprintf(&msg, "RegisterNatives failed for '%s', aborting...", className);
+        asprintf(&msg, "RegisterNatives failed for '%s'; aborting...", className);
         e->FatalError(msg);
     }