Changeset 7862


Ignore:
Timestamp:
05/21/12 18:21:03 (7 years ago)
Author:
ascheibe
Message:

#1854 fixed compatibility issue with 3.3.6

Location:
trunk/sources
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/SlaveView.cs

    r7857 r7862  
    6969          txtName.Text = ct.Name;
    7070          txtHbIntervall.Text = ct.HbInterval.ToString();
    71           cbxDisposable.Checked = ct.IsDisposable;
     71          cbxDisposable.Checked = ct.IsDisposable.GetValueOrDefault();
    7272          txtCPU.Text = string.Format("{0} Cores @ {1} Mhz, Arch.: {2}", ct.Cores.ToString(), ct.CpuSpeed.ToString(), ct.CpuArchitecture.ToString());
    7373          txtDetailsDescription.Text = ct.Description;
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveServiceClient.cs

    r7857 r7862  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.269
     4//     Runtime Version:4.0.30319.544
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    5959
    6060    public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
     61
     62
    6163  }
    6264
     
    967969
    968970    [System.Runtime.Serialization.OptionalFieldAttribute()]
    969     private bool IsDisposableField;
     971    private System.Nullable<bool> IsDisposableField;
    970972
    971973    [System.Runtime.Serialization.OptionalFieldAttribute()]
     
    10731075
    10741076    [System.Runtime.Serialization.DataMemberAttribute()]
    1075     public bool IsDisposable {
     1077    public System.Nullable<bool> IsDisposable {
    10761078      get {
    10771079        return this.IsDisposableField;
  • trunk/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml

    r7857 r7862  
    5555        <Column Name="LastHeartbeat" Type="System.DateTime" DbType="DateTime" CanBeNull="true" />
    5656        <Column Name="CpuUtilization" Type="System.Double" DbType="float" CanBeNull="false" />
    57         <Column Name="IsDisposable" Type="System.Boolean" DbType="Bit" CanBeNull="false" />
     57        <Column Name="IsDisposable" Type="System.Boolean" DbType="Bit" CanBeNull="true" />
    5858      </Type>
    5959      <Type Name="SlaveGroup" InheritanceCode="GROUP" />
  • trunk/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml.layout

    r7857 r7862  
    179179      </nodes>
    180180    </associationConnector>
    181     <associationConnector edgePoints="[(7.5 : 4.30930826822917); (7.5 : 4.876650890625); (8.875 : 4.876650890625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
     181    <associationConnector edgePoints="[(7.5 : 4.30930826822917); (7.5 : 4.876650890625); (7.97916666666667 : 4.876650890625 : JumpStart); (8.14583333333333 : 4.876650890625 : JumpEnd); (8.875 : 4.876650890625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
    182182      <AssociationMoniker Name="/HiveDataContext/Task/Task_AssignedResource" />
    183183      <nodes>
  • trunk/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs

    r7857 r7862  
    33// <auto-generated>
    44//     This code was generated by a tool.
    5 //     Runtime Version:4.0.30319.269
     5//     Runtime Version:4.0.30319.544
    66//
    77//     Changes to this file may cause incorrect behavior and will be lost if
     
    11791179    private double _CpuUtilization;
    11801180   
    1181     private bool _IsDisposable;
     1181    private System.Nullable<bool> _IsDisposable;
    11821182   
    11831183    #region Extensibility Method Definitions
     
    12091209    partial void OnCpuUtilizationChanging(double value);
    12101210    partial void OnCpuUtilizationChanged();
    1211     partial void OnIsDisposableChanging(bool value);
     1211    partial void OnIsDisposableChanging(System.Nullable<bool> value);
    12121212    partial void OnIsDisposableChanged();
    12131213    #endregion
     
    14591459   
    14601460    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsDisposable", DbType="Bit")]
    1461     public bool IsDisposable
     1461    public System.Nullable<bool> IsDisposable
    14621462    {
    14631463      get
  • trunk/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/Slave.cs

    r7857 r7862  
    5454    public double CpuUtilization { get; set; }
    5555    [DataMember]
    56     public bool IsDisposable { get; set; }
     56    public bool? IsDisposable { get; set; }
    5757
    5858    public Slave() {
  • trunk/sources/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs

    r7857 r7862  
    122122    /// </summary>
    123123    private void DeleteObsoleteSlaves() {
    124       var slaves = dao.GetSlaves(x => x.IsDisposable && x.SlaveState == SlaveState.Offline && (DateTime.Now - x.LastHeartbeat) > HeuristicLab.Services.Hive.Properties.Settings.Default.SweepInterval);
     124      var slaves = dao.GetSlaves(x => x.IsDisposable.GetValueOrDefault() && x.SlaveState == SlaveState.Offline && (DateTime.Now - x.LastHeartbeat) > HeuristicLab.Services.Hive.Properties.Settings.Default.SweepInterval);
    125125      foreach (DT.Slave slave in slaves) dao.DeleteSlave(slave.Id);
    126126    }
Note: See TracChangeset for help on using the changeset viewer.