You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2011/06/05 10:24:26 UTC
svn commit: r1132015 - in /incubator/mesos/trunk/src/swig/java:
mesosJNI.java.patch1 mesosJNI.java.patch2
Author: benh
Date: Sun Jun 5 08:24:26 2011
New Revision: 1132015
URL: http://svn.apache.org/viewvc?rev=1132015&view=rev
Log:
Fixing patches to catch Java exceptions for updated API.
Modified:
incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch1
incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch2
Modified: incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch1
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch1?rev=1132015&r1=1132014&r2=1132015&view=diff
==============================================================================
--- incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch1 (original)
+++ incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch1 Sun Jun 5 08:24:26 2011
@@ -1,14 +1,6 @@
--- mesos/mesosJNI.java 2010-05-12 14:19:47.000000000 -0700
-+++ mesosJNI.java 2010-05-12 14:50:31.000000000 -0700
-@@ -1,6 +1,6 @@
- /* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
-- * Version 1.3.36
-+ * Version 1.3.40
- *
- * Do not make changes to this file unless you know what you are doing--modify
- * the SWIG interface file instead.
-@@ -177,49 +177,49 @@
++++ mesos/mesosJNI.java.patched 2010-05-12 14:50:31.000000000 -0700
+@@ -157,49 +157,49 @@
public final static native long SWIGMesosExecutorDriverUpcast(long jarg1);
public static String SwigDirector_Scheduler_getFrameworkName(Scheduler self, long arg0) {
@@ -23,9 +15,9 @@
- self.registered(new SchedulerDriver(d, false), fid);
+ self.registered((d == 0) ? null : new SchedulerDriver(d, false), fid);
}
- public static void SwigDirector_Scheduler_resourceOffer(Scheduler self, long d, String oid, long offers) {
-- self.resourceOffer(new SchedulerDriver(d, false), oid, new SlaveOfferVector(offers, false));
-+ self.resourceOffer((d == 0) ? null : new SchedulerDriver(d, false), oid, new SlaveOfferVector(offers, false));
+ public static void SwigDirector_Scheduler_resourceOffer(Scheduler self, long d, String oid, java.util.List<SlaveOffer> offers) {
+- self.resourceOffer(new SchedulerDriver(d, false), oid, offers);
++ self.resourceOffer((d == 0) ? null : new SchedulerDriver(d, false), oid, offers);
}
public static void SwigDirector_Scheduler_offerRescinded(Scheduler self, long d, String oid) {
- self.offerRescinded(new SchedulerDriver(d, false), oid);
Modified: incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch2
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch2?rev=1132015&r1=1132014&r2=1132015&view=diff
==============================================================================
--- incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch2 (original)
+++ incubator/mesos/trunk/src/swig/java/mesosJNI.java.patch2 Sun Jun 5 08:24:26 2011
@@ -1,6 +1,6 @@
--- mesos/mesosJNI.java 2010-05-12 19:52:01.000000000 +0000
-+++ mesosJNI.java.patched 2010-05-12 19:49:26.000000000 +0000
-@@ -175,49 +175,79 @@
++++ mesos/mesosJNI.java.patched 2010-05-12 19:49:26.000000000 +0000
+@@ -157,49 +157,79 @@
public final static native long SWIGMesosExecutorDriverUpcast(long jarg1);
public static String SwigDirector_Scheduler_getFrameworkName(Scheduler self, long arg0) {
@@ -21,10 +21,10 @@
+ self.registered((d == 0) ? null : new SchedulerDriver(d, false), fid);
+ } catch (Throwable t) { t.printStackTrace(); System.exit(-1); }
}
- public static void SwigDirector_Scheduler_resourceOffer(Scheduler self, long d, String oid, long offers) {
-- self.resourceOffer((d == 0) ? null : new SchedulerDriver(d, false), oid, new SlaveOfferVector(offers, false));
+ public static void SwigDirector_Scheduler_resourceOffer(Scheduler self, long d, String oid, java.util.List<SlaveOffer> offers) {
+- self.resourceOffer((d == 0) ? null : new SchedulerDriver(d, false), oid, offers);
+ try {
-+ self.resourceOffer((d == 0) ? null : new SchedulerDriver(d, false), oid, new SlaveOfferVector(offers, false));
++ self.resourceOffer((d == 0) ? null : new SchedulerDriver(d, false), oid, offers);
+ } catch (Throwable t) { t.printStackTrace(); System.exit(-1); }
}
public static void SwigDirector_Scheduler_offerRescinded(Scheduler self, long d, String oid) {