prepare 4.6.3 release

build.gradle

@@ -43,7 +43,7 @@ libraries.internal = [
     "commons-codec:commons-codec:1.10",
     "com.google.guava:guava:19.0",
     "joda-time:joda-time:2.9.3",
-    "com.launchdarkly:okhttp-eventsource:1.9.0",
+    "com.launchdarkly:okhttp-eventsource:1.9.1",
     "org.yaml:snakeyaml:1.19",
     "redis.clients:jedis:2.9.0"
 ]
@@ -221,7 +221,7 @@ def shadeDependencies(jarTask) {
         configurations.runtime.collectMany {
             getPackagesInDependencyJar(it).collect { it.contains(".") ? it.substring(0, it.indexOf(".")) : it }
         }.
-            unique().findAll { it != "javax" } // also, don't shade javax
+            unique()
     topLevelPackages.forEach { top ->
         jarTask.relocate(top, "com.launchdarkly.shaded." + top) {
             excludePackages.forEach { exclude(it + ".*") }

src/main/java/com/launchdarkly/client/LDClient.java

@@ -116,8 +116,9 @@ public void track(String eventName, LDUser user, JsonElement data) {
     }
     if (user == null || user.getKey() == null) {
       logger.warn("Track called with null user or null user key!");
+    } else {
+      eventProcessor.sendEvent(EventFactory.DEFAULT.newCustomEvent(eventName, user, data));
     }
-    eventProcessor.sendEvent(EventFactory.DEFAULT.newCustomEvent(eventName, user, data));
   }
 
   @Override
@@ -132,8 +133,9 @@ public void track(String eventName, LDUser user) {
   public void identify(LDUser user) {
     if (user == null || user.getKey() == null) {
       logger.warn("Identify called with null user or null user key!");
+    } else {
+      eventProcessor.sendEvent(EventFactory.DEFAULT.newIdentifyEvent(user));
     }
-    eventProcessor.sendEvent(EventFactory.DEFAULT.newIdentifyEvent(user));
   }
 
   private void sendFlagRequestEvent(Event.FeatureRequest event) {

src/test/java/com/launchdarkly/client/LDClientEventTest.java

@@ -23,6 +23,7 @@
 
 public class LDClientEventTest {
   private static final LDUser user = new LDUser("userkey");
+  private static final LDUser userWithNullKey = new LDUser.Builder((String)null).build();
 
   private FeatureStore featureStore = TestUtil.initedFeatureStore();
   private TestUtil.TestEventProcessor eventSink = new TestUtil.TestEventProcessor();
@@ -43,6 +44,18 @@ public void identifySendsEvent() throws Exception {
     Event.Identify ie = (Event.Identify)e;
     assertEquals(user.getKey(), ie.user.getKey());
   }
+
+  @Test
+  public void identifyWithNullUserDoesNotSendEvent() {
+    client.identify(null);
+    assertEquals(0, eventSink.events.size());
+  }
+
+  @Test
+  public void identifyWithUserWithNoKeyDoesNotSendEvent() {
+    client.identify(userWithNullKey);
+    assertEquals(0, eventSink.events.size());
+  }
 
   @Test
   public void trackSendsEventWithoutData() throws Exception {
@@ -72,6 +85,18 @@ public void trackSendsEventWithData() throws Exception {
     assertEquals(data, ce.data);
   }
 
+  @Test
+  public void trackWithNullUserDoesNotSendEvent() {
+    client.track("eventkey", null);
+    assertEquals(0, eventSink.events.size());
+  }
+
+  @Test
+  public void trackWithUserWithNoKeyDoesNotSendEvent() {
+    client.track("eventkey", userWithNullKey);
+    assertEquals(0, eventSink.events.size());
+  }
+
   @Test
   public void boolVariationSendsEvent() throws Exception {
     FeatureFlag flag = flagWithValue("key", jbool(true));