| Index: components/invalidation/impl/invalidation_service_android.cc
|
| diff --git a/components/invalidation/impl/invalidation_service_android.cc b/components/invalidation/impl/invalidation_service_android.cc
|
| index cb7d845aaa2288f2f6761f2f5ac8dc3a1297e8fd..500aca4cf03300bf89344d508f8429ba60bc30e7 100644
|
| --- a/components/invalidation/impl/invalidation_service_android.cc
|
| +++ b/components/invalidation/impl/invalidation_service_android.cc
|
| @@ -154,8 +154,12 @@ void InvalidationServiceAndroid::Invalidate(
|
| return;
|
| }
|
| max_invalidation_versions_[object_id] = version;
|
| - object_invalidation_map.Insert(syncer::Invalidation::Init(
|
| - object_id, version, ConvertJavaStringToUTF8(env, java_payload)));
|
| + std::string payload;
|
| + if (!java_payload.is_null())
|
| + ConvertJavaStringToUTF8(env, java_payload, &payload);
|
| +
|
| + object_invalidation_map.Insert(
|
| + syncer::Invalidation::Init(object_id, version, payload));
|
| }
|
| }
|
|
|
|
|